diff --git a/.eslintrc.js b/.eslintrc.js
index 22b94d79e369..b5b4add538f6 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -24,7 +24,7 @@ const restrictedImportPatterns = [
 ];
 
 module.exports = {
-    extends: ['expensify', 'plugin:storybook/recommended', 'plugin:react-hooks/recommended', 'prettier', 'plugin:react-native-a11y/basic'],
+    extends: ['expensify', 'plugin:storybook/recommended', 'plugin:react-hooks/recommended', 'plugin:react-native-a11y/basic', 'prettier'],
     plugins: ['react-hooks', 'react-native-a11y'],
     parser: 'babel-eslint',
     ignorePatterns: ['!.*', 'src/vendor', '.github/actions/**/index.js', 'desktop/dist/*.js', 'dist/*.js', 'node_modules/.bin/**', 'node_modules/.cache/**', '.git/**'],
@@ -75,6 +75,7 @@ module.exports = {
                         patterns: restrictedImportPatterns,
                     },
                 ],
+                curly: 'error',
             },
         },
         {
@@ -161,10 +162,11 @@ module.exports = {
                         patterns: restrictedImportPatterns,
                     },
                 ],
+                curly: 'error',
             },
         },
         {
-            files: ['tests/**/*.{js,jsx,ts,tsx}', '.github/**/*.{js,jsx,ts,tsx}'],
+            files: ['workflow_tests/**/*.{js,jsx,ts,tsx}', 'tests/**/*.{js,jsx,ts,tsx}', '.github/**/*.{js,jsx,ts,tsx}'],
             rules: {
                 '@lwc/lwc/no-async-await': 'off',
                 'no-await-in-loop': 'off',
diff --git a/.github/ISSUE_TEMPLATE/Accessibility.md b/.github/ISSUE_TEMPLATE/Accessibility.md
index 36a64aa25b43..1323e2c17e78 100644
--- a/.github/ISSUE_TEMPLATE/Accessibility.md
+++ b/.github/ISSUE_TEMPLATE/Accessibility.md
@@ -34,7 +34,7 @@ What can we do to fix the issue?
 <!--- 
 Check off any platforms that are affected by this issue
 --->
-Which of our officially supported platforms is this issue occurring on?
+Which of our officially supported platforms is this issue occurring on? Please only tick the box if you have provided a screen-recording in the thread for each platform:
 - [ ] Android / native
 - [ ] Android / Chrome
 - [ ] iOS / native
diff --git a/.github/actions/composite/buildAndroidAPK/action.yml b/.github/actions/composite/buildAndroidAPK/action.yml
index 819234df0bc3..fc280ab2a223 100644
--- a/.github/actions/composite/buildAndroidAPK/action.yml
+++ b/.github/actions/composite/buildAndroidAPK/action.yml
@@ -13,7 +13,7 @@ runs:
 
     - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
       with:
-        ruby-version: '2.7'
+        ruby-version: "2.7"
         bundler-cache: true
 
     - uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef
@@ -26,4 +26,4 @@ runs:
       uses: actions/upload-artifact@65d862660abb392b8c4a3d1195a2108db131dd05
       with:
         name: ${{ inputs.ARTIFACT_NAME }}
-        path: android/app/build/outputs/apk/e2eRelease/app-e2eRelease.apk
+        path: android/app/build/outputs/apk/e2e/release/app-e2e-release.apk
diff --git a/.github/actions/javascript/getPullRequestDetails/action.yml b/.github/actions/javascript/getPullRequestDetails/action.yml
index a59cf55bdf9f..ed2c60f018a1 100644
--- a/.github/actions/javascript/getPullRequestDetails/action.yml
+++ b/.github/actions/javascript/getPullRequestDetails/action.yml
@@ -13,8 +13,14 @@ inputs:
 outputs:
   MERGE_COMMIT_SHA:
     description: 'The merge_commit_sha of the given pull request'
+  HEAD_COMMIT_SHA:
+    description: 'The head_commit_sha of the given pull request'
   MERGE_ACTOR:
     description: 'The actor who merged the pull request'
+  IS_MERGED:
+    description: 'True if the pull request is merged'
+  FORKED_REPO_URL:
+    description: 'Output forked repo URL if PR includes changes from a fork'
 runs:
   using: 'node16'
   main: './index.js'
diff --git a/.github/scripts/createDocsRoutes.js b/.github/scripts/createDocsRoutes.js
index 0fc9aa33ff27..6604a9d207fa 100644
--- a/.github/scripts/createDocsRoutes.js
+++ b/.github/scripts/createDocsRoutes.js
@@ -2,17 +2,21 @@ const yaml = require('js-yaml');
 const fs = require('fs');
 const _ = require('underscore');
 
-const warn = 'Number of hubs in _routes.yml does not match number of hubs in docs/articles. Please update _routes.yml with hub info.';
+const warnMessage = (platform) => `Number of hubs in _routes.yml does not match number of hubs in docs/${platform}/articles. Please update _routes.yml with hub info.`;
 const disclaimer = '# This file is auto-generated. Do not edit it directly. Use npm run createDocsRoutes instead.\n';
 const docsDir = `${process.cwd()}/docs`;
 const routes = yaml.load(fs.readFileSync(`${docsDir}/_data/_routes.yml`, 'utf8'));
+const platformNames = {
+    expensifyClassic: 'expensify-classic',
+    newExpensify: 'new-expensify',
+};
 
 /**
  * @param {String} str - The string to convert to title case
  * @returns {String}
  */
 function toTitleCase(str) {
-    return str.replace(/\w\S*/g, (txt) => txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase());
+    return str.replace(/\w\S*/g, (txt) => txt.charAt(0).toUpperCase() + txt.substr(1));
 }
 
 /**
@@ -28,7 +32,7 @@ function getArticleObj(filename) {
 }
 
 /**
- * If the articlea / sections exist in the hub, then push the entry to the array.
+ * If the article / sections exist in the hub, then push the entry to the array.
  * Otherwise, create the array and push the entry to it.
  * @param {*} hubs - The hubs array
  * @param {*} hub - The hub we are iterating
@@ -44,20 +48,20 @@ function pushOrCreateEntry(hubs, hub, key, entry) {
     }
 }
 
-function run() {
-    const hubs = fs.readdirSync(`${docsDir}/articles`);
-    if (hubs.length !== routes.hubs.length) {
-        // If new hubs have been added without metadata addition to _routes.yml
-        console.error(warn);
-        process.exit(1);
-    }
+/**
+ * Add articles and sections to hubs
+ * @param {Array} hubs - The hubs inside docs/articles/ for a platform
+ * @param {String} platformName - Expensify Classic or New Expensify
+ * @param {Array} routeHubs - The hubs insude docs/data/_routes.yml for a platform
+ */
+function createHubsWithArticles(hubs, platformName, routeHubs) {
     _.each(hubs, (hub) => {
         // Iterate through each directory in articles
-        fs.readdirSync(`${docsDir}/articles/${hub}`).forEach((fileOrFolder) => {
+        fs.readdirSync(`${docsDir}/articles/${platformName}/${hub}`).forEach((fileOrFolder) => {
             // If the directory content is a markdown file, then it is an article
             if (fileOrFolder.endsWith('.md')) {
                 const articleObj = getArticleObj(fileOrFolder);
-                pushOrCreateEntry(routes.hubs, hub, 'articles', articleObj);
+                pushOrCreateEntry(routeHubs, hub, 'articles', articleObj);
                 return;
             }
 
@@ -66,17 +70,38 @@ function run() {
             const articles = [];
 
             // Each subfolder will be a section containing articles
-            fs.readdirSync(`${docsDir}/articles/${hub}/${section}`).forEach((subArticle) => {
+            fs.readdirSync(`${docsDir}/articles/${platformName}/${hub}/${section}`).forEach((subArticle) => {
                 articles.push(getArticleObj(subArticle));
             });
 
-            pushOrCreateEntry(routes.hubs, hub, 'sections', {
+            pushOrCreateEntry(routeHubs, hub, 'sections', {
                 href: section,
                 title: toTitleCase(section.replaceAll('-', ' ')),
                 articles,
             });
         });
     });
+}
+
+function run() {
+    const expensifyClassicArticleHubs = fs.readdirSync(`${docsDir}/articles/${platformNames.expensifyClassic}`);
+    const newExpensifyArticleHubs = fs.readdirSync(`${docsDir}/articles/${platformNames.newExpensify}`);
+
+    const expensifyClassicRoute = _.find(routes.platforms, (platform) => platform.href === platformNames.expensifyClassic);
+    const newExpensifyRoute = _.find(routes.platforms, (platform) => platform.href === platformNames.newExpensify);
+
+    if (expensifyClassicArticleHubs.length !== expensifyClassicRoute.hubs.length) {
+        console.error(warnMessage(platformNames.expensifyClassic));
+        process.exit(1);
+    }
+
+    if (newExpensifyArticleHubs.length !== newExpensifyRoute.hubs.length) {
+        console.error(warnMessage(platformNames.newExpensify));
+        process.exit(1);
+    }
+
+    createHubsWithArticles(expensifyClassicArticleHubs, platformNames.expensifyClassic, expensifyClassicRoute.hubs);
+    createHubsWithArticles(newExpensifyArticleHubs, platformNames.newExpensify, newExpensifyRoute.hubs);
 
     // Convert the object to YAML and write it to the file
     let yamlString = yaml.dump(routes);
diff --git a/.github/scripts/findUnusedKeys.sh b/.github/scripts/findUnusedKeys.sh
new file mode 100755
index 000000000000..77c3ea25326b
--- /dev/null
+++ b/.github/scripts/findUnusedKeys.sh
@@ -0,0 +1,375 @@
+#!/bin/bash
+
+# Configurations
+declare LIB_PATH
+LIB_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd ../../ && pwd)"
+
+readonly SRC_DIR="${LIB_PATH}/src"
+readonly STYLES_DIR="${LIB_PATH}/src/styles"
+readonly STYLES_FILE="${LIB_PATH}/src/styles/styles.js"
+readonly UTILITIES_STYLES_FILE="${LIB_PATH}/src/styles/utilities"
+readonly STYLES_KEYS_FILE="${LIB_PATH}/scripts/style_keys_list_temp.txt"
+readonly UTILITY_STYLES_KEYS_FILE="${LIB_PATH}/scripts/utility_keys_list_temp.txt"
+readonly REMOVAL_KEYS_FILE="${LIB_PATH}/scripts/removal_keys_list_temp.txt"
+readonly AMOUNT_LINES_TO_SHOW=3
+
+readonly FILE_EXTENSIONS=('-name' '*.js' '-o' '-name' '*.jsx' '-o' '-name' '*.ts' '-o' '-name' '*.tsx')
+
+source scripts/shellUtils.sh
+
+# trap ctrl-c and call ctrl_c()
+trap ctrl_c INT
+
+delete_temp_files() {
+  find "${LIB_PATH}/scripts" -name "*keys_list_temp*" -type f -exec rm -f {} \;
+}
+
+# shellcheck disable=SC2317  # Don't warn about unreachable commands in this function
+ctrl_c() {
+  delete_temp_files
+  exit 1
+}
+  
+count_lines() {
+  local file=$1
+  if [[ -e "$file" ]]; then
+    wc -l < "$file"
+  else
+    echo "File not found: $file"
+  fi
+}
+
+# Read the style file with unused keys
+show_unused_style_keywords() {
+  while IFS=: read -r key file line_number; do
+    title "File: $file:$line_number"
+    
+    # Get lines before and after the error line
+    local lines_before=$((line_number - AMOUNT_LINES_TO_SHOW))
+    local lines_after=$((line_number + AMOUNT_LINES_TO_SHOW))
+    
+    # Read the lines into an array
+    local lines=()
+    while IFS= read -r line; do
+      lines+=("$line")
+    done < "$file"
+
+    # Loop through the lines
+    for ((i = lines_before; i <= lines_after; i++)); do
+      local line="${lines[i]}"
+      # Print context of the error line
+      echo "$line"
+    done
+    error "Unused key: $key"
+    echo "--------------------------------"
+  done < "$STYLES_KEYS_FILE"
+}
+
+# Function to remove a keyword from the temp file
+remove_keyword() {
+  local keyword="$1"
+  if grep -q "$keyword" "$STYLES_KEYS_FILE"; then
+    grep -v "$keyword" "$STYLES_KEYS_FILE" > "$REMOVAL_KEYS_FILE"
+    mv "$REMOVAL_KEYS_FILE" "$STYLES_KEYS_FILE"
+
+    return 0 # Keyword was removed
+  else
+    return 1 # Keyword was not found
+  fi
+}
+
+lookfor_unused_keywords() {
+  # Loop through all files in the src folder
+  while read -r file; do
+
+    # Search for keywords starting with "styles"
+    while IFS= read -r keyword; do
+        
+        # Remove any [ ] characters from the keyword
+        local clean_keyword="${keyword//[\[\]]/}"
+        # skip styles. keyword that might be used in comments
+        if [[ "$clean_keyword" == "styles." ]]; then
+          continue
+        fi
+        
+        if ! remove_keyword "$clean_keyword" ; then
+          # In case of a leaf of the styles object is being used, it means the parent objects is being used
+          # we need to mark it as used.
+          if [[ "$clean_keyword" =~ ^styles\.[a-zA-Z0-9_-]+\.[a-zA-Z0-9_-]+$ ]]; then
+            # Keyword has more than two words, remove words after the second word
+            local keyword_prefix="${clean_keyword%.*}"
+            remove_keyword "$keyword_prefix"
+          fi        
+        fi
+    done < <(grep -E -o '\bstyles\.[a-zA-Z0-9_.]*' "$file" | grep -v '\/\/' | grep -vE '\/\*.*\*\/')
+  done < <(find "${SRC_DIR}" -type f \( "${FILE_EXTENSIONS[@]}" \))
+}
+
+
+# Function to find and store keys from a file
+find_styles_object_and_store_keys() {
+  local file="$1"
+  local base_name="${2:-styles}" # Set styles as default
+  local line_number=0
+  local inside_arrow_function=false
+
+  while IFS= read -r line; do
+    ((line_number++))
+
+    # Check if we are inside an arrow function and we find a closing curly brace
+    if [[ "$inside_arrow_function" == true ]]; then
+      if [[ "$line" =~ ^[[:space:]]*\}\) ]]; then
+        inside_arrow_function=false
+      fi
+      continue
+    fi
+
+    # Check if we are inside an arrow function
+    if [[ "$line" =~ ^[[:space:]]*([a-zA-Z0-9_-])+:[[:space:]]*\(.*\)[[:space:]]*'=>'[[:space:]]*\(\{ || "$line" =~ ^[[:space:]]*(const|let|var)[[:space:]]+([a-zA-Z0-9_-]+)[[:space:]]*=[[:space:]]*\(.*\)[[:space:]]*'=>' ]]; then
+      inside_arrow_function=true
+      continue
+    fi
+
+    # Skip lines that are not key-related
+    if [[ ! "$line" =~ ^[[:space:]]*(const|let|var)[[:space:]]+([a-zA-Z0-9_-]+)[[:space:]]*=[[:space:]]*\{|^[[:space:]]*([a-zA-Z0-9_-]+\.)?[a-zA-Z0-9_-]+:[[:space:]]*\{|^[[:space:]]*\} ]]; then
+      continue
+    fi
+    
+    if [[ "$line" =~ ^[[:space:]]*(const|let|var)[[:space:]]+([a-zA-Z0-9_-]+)[[:space:]]*=[[:space:]]*\{ ]]; then
+      key="${BASH_REMATCH[2]%%:*{*)}"
+      echo "styles.${key}|...${key}|${base_name}.${key}:${file}:${line_number}" >> "$STYLES_KEYS_FILE"    
+    fi
+  done < "$file"
+}
+
+find_styles_functions_and_store_keys() {
+  local file="$1"
+  local line_number=0
+  local inside_object=false
+  local inside_arrow_function=false
+  local key=""
+
+  while IFS= read -r line; do
+    ((line_number++))
+
+    # Skip lines that are not key-related
+    if [[ "${line}" == *styles* ]]; then
+      continue
+    fi
+
+    # Check if we are inside an arrow function and we find a closing curly brace
+    if [[ "$inside_arrow_function" == true ]]; then
+      if [[ "$line" =~ ^[[:space:]]*\}\) ]]; then
+        inside_arrow_function=false
+      fi
+      continue
+    fi
+
+    # Check if we are inside an arrow function
+    if [[ "${line}" =~ ^[[:space:]]*([a-zA-Z0-9_-])+:[[:space:]]*\(.*\)[[:space:]]*'=>'[[:space:]]*\( ]]; then
+      inside_arrow_function=true
+      key="${line%%:*}"
+      key="${key// /}"  # Trim spaces
+      echo "styles.${key}|...${key}:${file}:${line_number}" >> "$STYLES_KEYS_FILE"
+      continue
+    fi
+
+    if [[ "$line" =~ ^[[:space:]]*(const|let|var)[[:space:]]+([a-zA-Z0-9_-]+)[[:space:]]*=[[:space:]]*\(.*\)[[:space:]]*'=>' ]]; then
+      inside_arrow_function=true
+      key="${BASH_REMATCH[2]}"
+      key="${key// /}"  # Trim spaces
+      echo "styles.${key}|...${key}:${file}:${line_number}" >> "$STYLES_KEYS_FILE"
+      continue
+    fi
+
+  done < "$file"
+}
+
+find_theme_style_and_store_keys() {
+  local file="$1"
+  local start_line_number="$2"
+  local base_name="${3:-styles}" # Set styles as default
+  local parent_keys=()
+  local root_key=""
+  local line_number=0
+  local inside_arrow_function=false
+
+  while IFS= read -r line; do
+    ((line_number++))
+
+    if [ ! "$line_number" -ge "$start_line_number" ]; then
+      continue
+    fi
+
+    # Check if we are inside an arrow function and we find a closing curly brace
+    if [[ "$inside_arrow_function" == true ]]; then
+      if [[ "$line" =~ ^[[:space:]]*\}\) ]]; then
+        inside_arrow_function=false
+      fi
+      continue
+    fi
+
+    # Check if we are inside an arrow function
+    if [[ "$line" =~ ^[[:space:]]*([a-zA-Z0-9_-])+:[[:space:]]*\(.*\)[[:space:]]*'=>'[[:space:]]*\(\{ || "$line" =~ ^[[:space:]]*(const|let|var)[[:space:]]+([a-zA-Z0-9_-]+)[[:space:]]*=[[:space:]]*\(.*\)[[:space:]]*'=>' ]]; then
+      inside_arrow_function=true
+      continue
+    fi
+
+    # Skip lines that are not key-related
+    if [[ ! "$line" =~ ^[[:space:]]*(const|let|var)[[:space:]]+([a-zA-Z0-9_-]+)[[:space:]]*=[[:space:]]*\{|^[[:space:]]*([a-zA-Z0-9_-]+\.)?[a-zA-Z0-9_-]+:[[:space:]]*\{|^[[:space:]]*\} ]]; then
+
+      continue
+    fi
+    
+    if [[ "$line" =~ ^[[:space:]]*([a-zA-Z0-9_-]+\.)?[a-zA-Z0-9_-]+:[[:space:]]*\{|^[[:space:]]*([a-zA-Z0-9_-])+:[[:space:]]*\(.*\)[[:space:]]*'=>'[[:space:]]*\(\{ ]]; then
+      # Removing all the extra lines after the ":"
+      local key="${line%%:*}"
+      key="${key// /}"  # Trim spaces
+
+      if [[ ${#parent_keys[@]} -gt 0 ]]; then
+        local parent_key_trimmed="${parent_keys[${#parent_keys[@]}-1]// /}"  # Trim spaces
+        key="$parent_key_trimmed.$key"
+      elif [[ -n "$root_key" ]]; then
+        local parent_key_trimmed="${root_key// /}"  # Trim spaces
+        key="$parent_key_trimmed.$key"
+      fi
+
+      echo "styles.${key}|...${key}|${base_name}.${key}:${file}:${line_number}" >> "$STYLES_KEYS_FILE"
+      parent_keys+=("$key")
+    elif [[ "$line" =~ ^[[:space:]]*\} ]]; then
+      parent_keys=("${parent_keys[@]:0:${#parent_keys[@]}-1}")
+    fi
+  done < "$file"
+}
+
+# Given that all the styles are inside of a function, we need to find the function and then look for the styles
+collect_theme_keys_from_styles() {
+  local file="$1"
+  local line_number=0
+  local inside_styles=false
+
+  while IFS= read -r line; do
+    ((line_number++))
+
+    if [[ "$inside_styles" == false ]]; then
+      if [[ "$line" =~ ^[[:space:]]*(const|let|var)[[:space:]]+([a-zA-Z0-9_-]+)[[:space:]]*=[[:space:]]*\(.*\)[[:space:]]*'=>' ]]; then
+        key="${BASH_REMATCH[2]}"
+        key="${key// /}"  # Trim spaces
+        if [[ "$key" == "styles"* ]]; then
+          inside_styles=true
+          # Need to start within the style function
+          ((line_number++))
+          find_theme_style_and_store_keys "$STYLES_FILE" "$line_number"
+        fi
+        continue
+      fi
+    fi
+  done < "$file"
+}
+
+lookfor_unused_spread_keywords() {
+  local inside_object=false
+  local key=""
+
+  while IFS= read -r line; do
+    # Detect the start of an object
+    if [[ "$line" =~ ^[[:space:]]*([a-zA-Z0-9_-]+\.)?[a-zA-Z0-9_-]+:[[:space:]]*\{ ]]; then
+      inside_object=true
+    fi
+
+    # Detect the end of an object
+    if [[ "$line" =~ ^[[:space:]]*\},?$ ]]; then
+      inside_object=false
+    fi
+
+    # If we're inside an object and the line starts with '...', capture the key
+    if [[ "$inside_object" == true && "$line" =~ ^[[:space:]]*\.\.\.([a-zA-Z0-9_]+)(\(.+\))?,?$ ]]; then
+      key="${BASH_REMATCH[1]}"
+      remove_keyword "...${key}"
+    fi
+  done < "$STYLES_FILE"
+}
+
+find_utility_styles_store_prefix() {
+  # Loop through all files in the src folder
+  while read -r file; do
+    # Search for keywords starting with "styles"
+    while IFS= read -r keyword; do
+        local variable="${keyword##*/}"
+        local variable_trimmed="${variable// /}"  # Trim spaces
+          
+        echo "$variable_trimmed" >> "$UTILITY_STYLES_KEYS_FILE"
+    done < <(grep -E -o './utilities/[a-zA-Z0-9_-]+' "$file" | grep -v '\/\/' | grep -vE '\/\*.*\*\/')
+  done < <(find "${STYLES_DIR}" -type f \( "${FILE_EXTENSIONS[@]}" \))
+
+  # Sort and remove duplicates from the temporary file
+  sort -u -o "${UTILITY_STYLES_KEYS_FILE}" "${UTILITY_STYLES_KEYS_FILE}"
+}
+
+find_utility_usage_as_styles() {
+  while read -r file; do
+    local root_key
+    local parent_dir
+
+    # Get the folder name, given this utility files are index.js
+    parent_dir=$(dirname "$file")
+    root_key=$(basename "${parent_dir}")
+
+    if [[ "${root_key}" == "utilities" ]]; then
+      continue
+    fi
+
+    find_theme_style_and_store_keys "${file}" 0 "${root_key}"
+  done < <(find "${UTILITIES_STYLES_FILE}" -type f \( "${FILE_EXTENSIONS[@]}" \))
+}
+
+lookfor_unused_utilities() {
+  # Read each utility keyword from the file
+  while read -r keyword; do
+    # Creating a copy so later the replacement can reference it  
+    local original_keyword="${keyword}"
+
+    # Iterate through all files in "src/styles"
+    while read -r file; do
+      # Find all words that match "$keyword.[a-zA-Z0-9_-]+"
+      while IFS= read -r match; do
+        # Replace the utility prefix with "styles"
+        local variable="${match/#$original_keyword/styles}"
+        # Call the remove_keyword function with the variable
+        remove_keyword "${variable}"
+        remove_keyword "${match}"
+      done < <(grep -E -o "$original_keyword\.[a-zA-Z0-9_-]+" "$file" | grep -v '\/\/' | grep -vE '\/\*.*\*\/')
+    done < <(find "${STYLES_DIR}" -type f \( "${FILE_EXTENSIONS[@]}" \))
+  done < "$UTILITY_STYLES_KEYS_FILE"
+}
+
+echo "🔍 Looking for styles."
+# Find and store the name of the utility files as keys
+find_utility_styles_store_prefix
+find_utility_usage_as_styles
+
+# Find and store keys from styles.js
+find_styles_object_and_store_keys "$STYLES_FILE"
+find_styles_functions_and_store_keys "$STYLES_FILE"
+collect_theme_keys_from_styles "$STYLES_FILE"
+
+echo "🗄️ Now going through the codebase and looking for unused keys."
+
+# Look for usages of utilities into src/styles
+lookfor_unused_utilities
+lookfor_unused_spread_keywords
+lookfor_unused_keywords
+
+final_styles_line_count=$(count_lines "$STYLES_KEYS_FILE")
+
+if [[ $final_styles_line_count -eq 0 ]]; then
+  # Exit successfully (status code 0)
+  delete_temp_files
+  success "Styles are in a good shape"
+  exit 0
+else
+  show_unused_style_keywords
+  delete_temp_files
+  error "Unused keys: $final_styles_line_count"
+  exit 1
+fi
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/e2ePerformanceTests.yml b/.github/workflows/e2ePerformanceTests.yml
index d8f9cad138d9..f7f1e5fc7ac7 100644
--- a/.github/workflows/e2ePerformanceTests.yml
+++ b/.github/workflows/e2ePerformanceTests.yml
@@ -84,12 +84,7 @@ jobs:
       - name: Unmerged PR - Fetch head ref of unmerged PR
         if: ${{ !fromJSON(steps.getPullRequestDetails.outputs.IS_MERGED) }}
         run: |
-          if [[ ${{ steps.getPullRequestDetails.outputs.FORKED_REPO_URL }} != '' ]]; then
-            git remote add pr_remote ${{ steps.getPullRequestDetails.outputs.FORKED_REPO_URL }}
-            git fetch pr_remote ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }} --no-tags --depth=1
-          else
-            git fetch origin ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }} --no-tags --depth=1
-          fi
+          git fetch origin ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }} --no-tags --depth=1
 
       - name: Unmerged PR - Set dummy git credentials before merging
         if: ${{ !fromJSON(steps.getPullRequestDetails.outputs.IS_MERGED) }}
@@ -101,7 +96,7 @@ jobs:
         if: ${{ !fromJSON(steps.getPullRequestDetails.outputs.IS_MERGED) }}
         id: getMergeCommitShaIfUnmergedPR
         run: |
-          git merge --no-commit ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }}
+          git merge --allow-unrelated-histories --no-commit ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }}
           git checkout ${{ steps.getPullRequestDetails.outputs.HEAD_COMMIT_SHA }}
         env:
           GITHUB_TOKEN: ${{ github.token }}
@@ -140,18 +135,19 @@ jobs:
           name: baseline-apk-${{ needs.buildBaseline.outputs.VERSION }}
           path: zip
 
-      # The downloaded artifact will be a file named "app-e2eRelease.apk" so we have to rename it
+      # The downloaded artifact will be a file named "app-e2e-release.apk" so we have to rename it
       - name: Rename baseline APK
-        run: mv "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease.apk" "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease-baseline.apk"
+        run: mv "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease-baseline.apk"
 
       - name: Download delta APK
         uses: actions/download-artifact@e9ef242655d12993efdcda9058dee2db83a2cb9b
+        id: downloadDeltaAPK
         with:
           name: delta-apk-${{ needs.buildDelta.outputs.DELTA_REF }}
           path: zip
 
       - name: Rename delta APK
-        run: mv "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease.apk" "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease-compare.apk"
+        run: mv "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadDeltaAPK.outputs.download-path}}/app-e2eRelease-compare.apk"
 
       - name: Copy e2e code into zip folder
         run: cp -r tests/e2e zip
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..b403a1eb737c 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
@@ -31,3 +33,7 @@ jobs:
             echo 'Error: Prettier diff detected! Please run `npm run prettier` and commit the changes.'
             exit 1
           fi
+
+      - name: Run unused style searcher
+        shell: bash
+        run: ./.github/scripts/findUnusedKeys.sh
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 a98381b0f4a7..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"
@@ -32,14 +33,17 @@ jobs:
   deployChecklist:
     name: Create or update deploy checklist
     runs-on: ubuntu-latest
+    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
-        run: echo "VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV"
+        run: echo "VERSION=$(npm run print-version --silent)" >> "$GITHUB_OUTPUT"
 
       - name: Create or update staging deploy
         uses: Expensify/App/.github/actions/javascript/createOrUpdateStagingDeploy@main
@@ -53,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
@@ -127,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
@@ -164,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
@@ -266,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
@@ -323,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 }}
 
@@ -333,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"
@@ -393,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..6ded44d7059f 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -19,7 +19,8 @@ jobs:
     outputs:
       READY_TO_BUILD: ${{ fromJSON(steps.isExpensifyEmployee.outputs.IS_EXPENSIFY_EMPLOYEE) && fromJSON(steps.hasReadyToBuildLabel.outputs.HAS_READY_TO_BUILD_LABEL) }}
     steps:
-      - id: isExpensifyEmployee
+      - name: Is Expensify employee
+        id: isExpensifyEmployee
         run: |
           if gh api /orgs/Expensify/teams/expensify-expensify/memberships/${{ github.actor }} --silent; then
             echo "IS_EXPENSIFY_EMPLOYEE=true" >> "$GITHUB_OUTPUT"
@@ -70,7 +71,8 @@ jobs:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
     steps:
       # This action checks-out the repository, so the workflow can access it.
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+      - name: Checkout
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
@@ -80,9 +82,11 @@ jobs:
           sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc
           echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
 
-      - uses: Expensify/App/.github/actions/composite/setupNode@main
+      - name: Setup Node
+        uses: Expensify/App/.github/actions/composite/setupNode@main
 
-      - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
         with:
           ruby-version: '2.7'
           bundler-cache: true
@@ -117,7 +121,8 @@ jobs:
           MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }}
           MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }}
 
-      - uses: actions/upload-artifact@v3
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
         with:
           name: android
           path: ./android_paths.json
@@ -131,7 +136,8 @@ jobs:
     runs-on: macos-12-xl
     steps:
       # This action checks-out the repository, so the workflow can access it.
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+      - name: Checkout
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
@@ -144,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'}"
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..d3b4daac04d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,3 +101,13 @@ tests/e2e/results/
 
 # Typescript
 tsconfig.tsbuildinfo
+
+# Mock-github
+/repo/
+
+# Workflow test logs
+/workflow_tests/logs/
+
+# Yalc
+.yalc
+yalc.lock
diff --git a/.storybook/preview.js b/.storybook/preview.js
index b198c0d2d626..a989960794f2 100644
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@@ -6,7 +6,7 @@ import './fonts.css';
 import ComposeProviders from '../src/components/ComposeProviders';
 import HTMLEngineProvider from '../src/components/HTMLEngineProvider';
 import OnyxProvider from '../src/components/OnyxProvider';
-import {LocaleContextProvider} from '../src/components/withLocalize';
+import {LocaleContextProvider} from '../src/components/LocaleContextProvider';
 import {KeyboardStateProvider} from '../src/components/withKeyboardState';
 import {EnvironmentProvider} from '../src/components/withEnvironment';
 import {WindowDimensionsProvider} from '../src/components/withWindowDimensions';
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..d6da0232f2fc 100644
--- a/.well-known/apple-app-site-association
+++ b/.well-known/apple-app-site-association
@@ -63,6 +63,22 @@
                     {
                         "/": "/new/*",
                         "comment": "New Chat"
+                    },
+                    {
+                        "/": "/workspace/*",
+                        "comment": "Workspace Details"
+                    },
+                    {
+                        "/": "/get-assistance/*",
+                        "comment": "Get Assistance Pages"
+                    },
+                    {
+                        "/": "/teachersunite/*",
+                        "comment": "Teachers Unite!"
+                    },
+                    {
+                        "/": "/search/*",
+                        "comment": "Search"
                     }
                 ]
             }
diff --git a/Cloudflare_CA.crt b/Cloudflare_CA.crt
new file mode 100644
index 000000000000..f02f49a951fc
Binary files /dev/null and b/Cloudflare_CA.crt differ
diff --git a/Gemfile.lock b/Gemfile.lock
index 9487e3c45c7a..079b5a5b742b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.3)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
@@ -19,20 +19,20 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.646.0)
-    aws-sdk-core (3.160.0)
+    aws-partitions (1.824.0)
+    aws-sdk-core (3.181.1)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.58.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kms (1.71.0)
+      aws-sdk-core (~> 3, >= 3.177.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.134.0)
+      aws-sdk-core (~> 3, >= 3.181.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.2)
+      aws-sigv4 (~> 1.6)
+    aws-sigv4 (1.6.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -79,7 +79,7 @@ GEM
       highline (~> 2.0.0)
     concurrent-ruby (1.2.2)
     declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
@@ -88,8 +88,8 @@ GEM
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.93.0)
-    faraday (1.10.2)
+    excon (0.103.0)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -117,8 +117,8 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.6)
-    fastlane (2.210.1)
+    fastimage (2.2.7)
+    fastlane (2.215.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -139,10 +139,11 @@ GEM
       google-apis-playcustomapp_v1 (~> 0.1)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
+      http-cookie (~> 1.0.5)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
       optparse (~> 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
@@ -150,7 +151,7 @@ GEM
       security (= 0.1.3)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
@@ -165,9 +166,9 @@ GEM
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.29.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-apis-core (0.9.0)
+    google-apis-androidpublisher_v3 (0.49.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.1)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -176,10 +177,10 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.15.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-apis-playcustomapp_v1 (0.11.0)
-      google-apis-core (>= 0.9.0, < 2.a)
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
     google-apis-storage_v1 (0.19.0)
       google-apis-core (>= 0.9.0, < 2.a)
     google-cloud-core (1.6.0)
@@ -187,8 +188,8 @@ GEM
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.0)
-    google-cloud-storage (1.43.0)
+    google-cloud-errors (1.3.1)
+    google-cloud-storage (1.44.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
@@ -196,10 +197,9 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.2.0)
+    googleauth (1.8.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
@@ -209,26 +209,25 @@ GEM
     httpclient (2.8.3)
     i18n (1.13.0)
       concurrent-ruby (~> 1.0)
-    jmespath (1.6.1)
+    jmespath (1.6.2)
     json (2.6.3)
-    jwt (2.5.0)
-    memoist (0.16.2)
+    jwt (2.7.1)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
-    mini_magick (4.11.0)
-    mini_mime (1.1.2)
+    mini_magick (4.12.0)
+    mini_mime (1.1.5)
     minitest (5.18.0)
     molinillo (0.8.0)
     multi_json (1.15.0)
-    multipart-post (2.0.0)
+    multipart-post (2.3.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
     optparse (0.1.1)
     os (1.1.4)
-    plist (3.6.0)
+    plist (3.7.0)
     public_suffix (4.0.7)
     rake (13.0.6)
     representable (3.2.0)
@@ -236,23 +235,23 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rouge (2.0.7)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.17.0)
+    signet (0.18.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simctl (1.6.8)
+    simctl (1.6.10)
       CFPropertyList
       naturally
     terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
@@ -266,8 +265,8 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
-    webrick (1.7.0)
+    unicode-display_width (2.4.2)
+    webrick (1.8.1)
     word_wrap (1.0.0)
     xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index bd38d9ebe4ba..1e2e9b46fad6 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'.
@@ -58,7 +58,7 @@ project.ext.envConfigFiles = [
     adhocRelease: ".env.adhoc",
     developmentRelease: ".env",
     developmentDebug: ".env",
-    e2eRelease: ".env.production"
+    e2eRelease: "tests/e2e/.env.e2e"
 ]
 
 /**
@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001036702
-        versionName "1.3.67-2"
+        versionCode 1001037503
+        versionName "1.3.75-3"
     }
 
     flavorDimensions "default"
@@ -136,10 +136,20 @@ android {
             signingConfig signingConfigs.debug
         }
         release {
-            signingConfig signingConfigs.release
             productFlavors.production.signingConfig signingConfigs.release
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+
+            signingConfig null
+            // buildTypes take precedence over productFlavors when it comes to the signing configuration,
+            // thus we need to manually set the signing config, so that the e2e uses the debug config again.
+            // In other words, the signingConfig setting above will be ignored when we build the flavor in release mode. 
+            productFlavors.all { flavor ->
+                // All release builds should be signed with the release config ...
+                flavor.signingConfig signingConfigs.release
+            }
+            // ... except for the e2e flavor, which we maybe want to build locally:
+            productFlavors.e2e.signingConfig signingConfigs.debug
         }
     }
 
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 8d69c62bfd1f..dc135fa9834e 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -67,6 +67,7 @@
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/split"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/request"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/new"/>
+                <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/search"/>
 
                 <!-- Staging URLs -->
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/r"/>
@@ -83,6 +84,7 @@
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/split"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/request"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/new"/>
+                <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/search"/>
             </intent-filter>
         </activity>
 
diff --git a/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java b/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java
index 0ba77f809b19..c60476ad3f0a 100644
--- a/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java
+++ b/android/app/src/main/java/com/expensify/chat/customairshipextender/CustomNotificationProvider.java
@@ -106,7 +106,8 @@ protected NotificationCompat.Builder onExtendBuilder(@NonNull Context context, @
                 if (payload.containsKey(ONYX_DATA_KEY)) {
                     Objects.requireNonNull(payload.get(ONYX_DATA_KEY)).isNull();
                     Log.d(TAG, "payload contains onxyData");
-                    applyMessageStyle(context, builder, payload, arguments.getNotificationId());
+                    String alert = message.getExtra(PushMessage.EXTRA_ALERT);
+                    applyMessageStyle(context, builder, payload, arguments.getNotificationId(), alert);
                 }
             } catch (Exception e) {
                 Log.e(TAG, "Failed to parse conversation, falling back to default notification style. SendID=" + message.getSendId(), e);
@@ -163,7 +164,7 @@ public Bitmap getCroppedBitmap(Bitmap bitmap) {
      * @param payload Notification payload, which contains all the data we need to build the notifications.
      * @param notificationID Current notification ID
      */
-    private void applyMessageStyle(@NonNull Context context, NotificationCompat.Builder builder, JsonMap payload, int notificationID) {
+    private void applyMessageStyle(@NonNull Context context, NotificationCompat.Builder builder, JsonMap payload, int notificationID, String alert) {
         long reportID = payload.get("reportID").getLong(-1);
         if (reportID == -1) {
             return;
@@ -181,7 +182,9 @@ private void applyMessageStyle(@NonNull Context context, NotificationCompat.Buil
             String name = messageData.get("person").getList().get(0).getMap().get("text").getString();
             String avatar = messageData.get("avatar").getString();
             String accountID = Integer.toString(messageData.get("actorAccountID").getInt(-1));
-            String message = messageData.get("message").getList().get(0).getMap().get("text").getString();
+            
+            // Use the formatted alert message from the backend. Otherwise fallback on the message in the Onyx data.
+            String message = alert != null ? alert : messageData.get("message").getList().get(0).getMap().get("text").getString();
             String conversationName = payload.get("roomName") == null ? "" : payload.get("roomName").getString("");
 
             // Retrieve or create the Person object who sent the latest report comment
diff --git a/android/app/src/main/res/drawable-hdpi/ic_notification.png b/android/app/src/main/res/drawable-hdpi/ic_notification.png
index 5a36b56c4bc9..7612112d1bc5 100644
Binary files a/android/app/src/main/res/drawable-hdpi/ic_notification.png and b/android/app/src/main/res/drawable-hdpi/ic_notification.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/ic_notification.png b/android/app/src/main/res/drawable-mdpi/ic_notification.png
index 502b45ac86bd..89accf5424f8 100644
Binary files a/android/app/src/main/res/drawable-mdpi/ic_notification.png and b/android/app/src/main/res/drawable-mdpi/ic_notification.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_notification.png b/android/app/src/main/res/drawable-xhdpi/ic_notification.png
index d03ded01cf16..a01f2c5e0dc9 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/ic_notification.png and b/android/app/src/main/res/drawable-xhdpi/ic_notification.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_notification.png b/android/app/src/main/res/drawable-xxhdpi/ic_notification.png
index cb9b4b24e518..3bb969329c79 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/ic_notification.png and b/android/app/src/main/res/drawable-xxhdpi/ic_notification.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png b/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png
index 2469d9193901..697922b1e689 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png and b/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png differ
diff --git a/assets/animations/Safe.json b/assets/animations/Safe.json
new file mode 100644
index 000000000000..15d4f4917dd0
--- /dev/null
+++ b/assets/animations/Safe.json
@@ -0,0 +1 @@
+{"v":"5.9.0","fr":24,"ip":0,"op":64,"w":625,"h":400,"nm":"C","assets":[{"id":"comp_0","nm":"E","fr":24,"layers":[{"ind":1,"ty":3,"nm":"s","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.1},"t":38,"s":[1002.5,667.5,0],"to":[25.25,-33.75,0],"ti":[-25.25,33.75,0]},{"t":48,"s":[1154,465,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":38,"s":[25,25,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":43,"s":[100,100,100]},{"t":48,"s":[25,25,100]}],"l":2}},"ao":0,"ip":38,"op":49,"st":0},{"ind":2,"ty":3,"nm":"s","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0},"t":38,"s":[941.5,674.5,0],"to":[-30.25,-30,0],"ti":[30.25,30,0]},{"t":48,"s":[760,494.5,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":38,"s":[25,25,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":43,"s":[100,100,100]},{"t":48,"s":[25,25,100]}],"l":2}},"ao":0,"ip":38,"op":49,"st":0},{"ind":3,"ty":3,"nm":"s","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.041},"t":38,"s":[984,730.5,0],"to":[7.333,29.25,0],"ti":[-7.333,-29.25,0]},{"t":48,"s":[1028,906,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":38,"s":[25,25,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":43,"s":[100,100,100]},{"t":48,"s":[25,25,100]}],"l":2}},"ao":0,"ip":38,"op":49,"st":0},{"ind":4,"ty":3,"nm":"s","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.166},"t":39,"s":[995.5,714.5,0],"to":[42,3.333,0],"ti":[-42,-3.333,0]},{"t":49,"s":[1247.5,734.5,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":39,"s":[25,25,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":44,"s":[100,100,100]},{"t":49,"s":[25,25,100]}],"l":2}},"ao":0,"ip":39,"op":50,"st":0},{"ind":5,"ty":3,"nm":"s","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.036},"t":39,"s":[957.5,666.5,0],"to":[9.167,-41.5,0],"ti":[-9.167,41.5,0]},{"t":49,"s":[1012.5,417.5,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":39,"s":[25,25,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":44,"s":[100,100,100]},{"t":49,"s":[25,25,100]}],"l":2}},"ao":0,"ip":39,"op":50,"st":0},{"ind":6,"ty":3,"nm":"s","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0},"t":39,"s":[932,732.5,0],"to":[-20.75,21.5,0],"ti":[20.75,-21.5,0]},{"t":49,"s":[807.5,861.5,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":39,"s":[25,25,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":44,"s":[100,100,100]},{"t":49,"s":[25,25,100]}],"l":2}},"ao":0,"ip":39,"op":50,"st":0},{"ind":7,"ty":3,"nm":"s","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":41,"s":[-44]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":46,"s":[0]},{"t":51,"s":[48]}]},"p":{"a":0,"k":[1033,663,0],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":41,"s":[25,25,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":46,"s":[100,100,100]},{"t":51,"s":[25,25,100]}],"l":2}},"ao":0,"ip":41,"op":52,"st":0},{"ind":8,"ty":3,"nm":"s","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":45,"s":[-45]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":49,"s":[0]},{"t":54,"s":[48]}]},"p":{"a":0,"k":[906,769,0],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":45,"s":[25,25,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":49,"s":[100,100,100]},{"t":54,"s":[25,25,100]}],"l":2}},"ao":0,"ip":44,"op":55,"st":2},{"ind":9,"ty":3,"nm":"b","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":0,"s":[886,870,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":5,"s":[886,870,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":33,"s":[886,870,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":37,"s":[886,870,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":38,"s":[886,870,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":42,"s":[886,870,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":52,"s":[886,870,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.65,"y":0.65},"o":{"x":0.313,"y":0.313},"t":57,"s":[886,870,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.378,"y":0.378},"t":59,"s":[886,870,0],"to":[0,0,0],"ti":[0,0,0]},{"t":63,"s":[886,870,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[106,92,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":5,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[0.407,0.407,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":33,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0.273,0.273,0]},"t":37,"s":[98.704,102.592,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":38,"s":[98,104,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":42,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":52,"s":[100,100,100]},{"i":{"x":[0.65,0.65,0.65],"y":[-0.264,-0.264,1]},"o":{"x":[0.313,0.313,0.313],"y":[0,0,0]},"t":57,"s":[97,103,100]},{"i":{"x":[0.831,0.831,0.831],"y":[0.881,0.881,1]},"o":{"x":[0.378,0.378,0.378],"y":[0.16,0.16,0]},"t":59,"s":[97.166,102.834,100]},{"t":63,"s":[100,100,100]}],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":10,"ty":3,"nm":"h","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[93,-80,0],"to":[0.667,0,0],"ti":[-0.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":6,"s":[97,-80,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":33,"s":[97,-80,0],"to":[13.333,0,0],"ti":[-13.333,0,0]},{"t":37,"s":[177,-80,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":6,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":33,"s":[100,100,100]},{"t":37,"s":[100,100,100]}],"l":2}},"ao":0,"ip":0,"op":38,"st":0},{"ind":11,"ty":3,"nm":"h","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":9,"s":[0]},{"i":{"x":[0.694],"y":[0.113]},"o":{"x":[0.299],"y":[0]},"t":14,"s":[13]},{"i":{"x":[0.79],"y":[0.911]},"o":{"x":[0.43],"y":[0.241]},"t":19,"s":[-6.26]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":21,"s":[-46]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":22,"s":[-81]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":23,"s":[-125]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":24,"s":[-241]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":25,"s":[-285]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":26,"s":[-319]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":32,"s":[-376]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":33,"s":[-376]},{"t":37,"s":[-372]}]},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[90,-80,0],"to":[0.833,0,0],"ti":[-0.833,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":6,"s":[95,-80,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":33,"s":[95,-80,0],"to":[13.333,0,0],"ti":[-13.333,0,0]},{"t":37,"s":[175,-80,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":6,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":33,"s":[100,100,100]},{"t":37,"s":[55,100,100]}],"l":2}},"ao":0,"ip":0,"op":38,"st":0},{"ind":12,"ty":3,"nm":"d","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[182,-134,0],"to":[0.667,0,0],"ti":[-0.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":6,"s":[186,-134,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":33,"s":[186,-134,0],"to":[6.5,0,0],"ti":[-6.5,0,0]},{"t":37,"s":[225,-134,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":6,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":33,"s":[100,100,100]},{"t":37,"s":[80,100,100]}],"l":2}},"ao":0,"ip":0,"op":38,"st":0},{"ind":13,"ty":3,"nm":"d","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[170,-139,0],"to":[0.667,0,0],"ti":[-0.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":6,"s":[174,-139,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":33,"s":[174,-139,0],"to":[5.833,0,0],"ti":[-5.833,0,0]},{"t":37,"s":[209,-139,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":6,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":33,"s":[100,100,100]},{"t":37,"s":[53,100,100]}],"l":2}},"ao":0,"ip":0,"op":38,"st":0},{"ind":14,"ty":3,"nm":"b","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":0,"k":[49,52,0],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":38,"st":0},{"ind":15,"ty":3,"nm":"d","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":0,"s":[223,-145,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":6,"s":[223,-145,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":33,"s":[223,-145,0],"to":[0,0,0],"ti":[0,0,0]},{"t":37,"s":[223,-145,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[114,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":6,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":33,"s":[100,100,100]},{"t":37,"s":[42,100,100]}],"l":2}},"ao":0,"ip":0,"op":38,"st":0},{"ind":16,"ty":3,"nm":"d","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[75.5,-107.5,0],"to":[0.583,0.583,0],"ti":[-0.583,-0.583,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":6,"s":[79,-104,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":33,"s":[79,-104,0],"to":[14.333,0,0],"ti":[-14.333,0,0]},{"t":37,"s":[165,-104,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":6,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":33,"s":[100,100,100]},{"t":37,"s":[100,100,100]}],"l":2}},"ao":0,"ip":0,"op":38,"st":0},{"ind":17,"ty":3,"nm":"d","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":38,"s":[222,-147,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":43,"s":[222,-147,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":51,"s":[222,-147,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.65,"y":0.65},"o":{"x":0.313,"y":0.313},"t":57,"s":[222,-147,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.378,"y":0.378},"t":59,"s":[222,-147,0],"to":[0,0,0],"ti":[0,0,0]},{"t":63,"s":[222,-147,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":38,"s":[111,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":43,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":51,"s":[100,100,100]},{"i":{"x":[0.65,0.65,0.65],"y":[-0.264,1,1]},"o":{"x":[0.313,0.313,0.313],"y":[0,0,0]},"t":57,"s":[111,100,100]},{"i":{"x":[0.831,0.831,0.831],"y":[0.881,1,1]},"o":{"x":[0.378,0.378,0.378],"y":[0.16,0,0]},"t":59,"s":[108.452,100,100]},{"t":63,"s":[65,100,100]}],"l":2}},"ao":0,"ip":38,"op":64,"st":0},{"ind":18,"ty":3,"nm":"d","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":38,"s":[306,-107,0],"to":[-1.333,0,0],"ti":[1.333,0,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":43,"s":[298,-107,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":51,"s":[298,-107,0],"to":[1.333,0,0],"ti":[4.333,0,0]},{"i":{"x":0.723,"y":1},"o":{"x":0.313,"y":0},"t":57,"s":[306,-107,0],"to":[-0.439,0,0],"ti":[0.802,0,0]},{"i":{"x":0.833,"y":1},"o":{"x":0.378,"y":0},"t":59,"s":[304.119,-107,0],"to":[-7.123,0,0],"ti":[5.093,0,0]},{"t":63,"s":[272,-107,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":38,"s":[109,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":43,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":51,"s":[100,100,100]},{"i":{"x":[0.65,0.65,0.65],"y":[-0.264,1,1]},"o":{"x":[0.313,0.313,0.313],"y":[0,0,0]},"t":57,"s":[109,100,100]},{"i":{"x":[0.831,0.831,0.831],"y":[0.881,1,1]},"o":{"x":[0.378,0.378,0.378],"y":[0.16,0,0]},"t":59,"s":[106.563,100,100]},{"t":63,"s":[65,100,100]}],"l":2}},"ao":0,"ip":38,"op":64,"st":0},{"ind":19,"ty":3,"nm":"b","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":0,"k":[49,52,0],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":20,"ty":3,"nm":"c","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":34,"s":[914,792,0],"to":[0,-1.667,0],"ti":[0,-0.5,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":38,"s":[914,782,0],"to":[0,0.5,0],"ti":[0,-1.667,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":43,"s":[914,795,0],"to":[0,1.667,0],"ti":[0,0.5,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":48,"s":[914,792,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":52,"s":[914,792,0],"to":[0,-0.667,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":1},"o":{"x":0.333,"y":0},"t":58,"s":[914,788,0],"to":[0,0,0],"ti":[0,-0.667,0]},{"t":63,"s":[914,792,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":21,"ty":3,"nm":"c","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":34,"s":[969,759,0],"to":[0,-1.667,0],"ti":[0,-0.5,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":38,"s":[969,749,0],"to":[0,0.5,0],"ti":[0,-1.667,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":43,"s":[969,762,0],"to":[0,1.667,0],"ti":[0,0.5,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":48,"s":[969,759,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":52,"s":[969,759,0],"to":[0,-0.667,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":1},"o":{"x":0.333,"y":0},"t":58,"s":[969,755,0],"to":[0,0,0],"ti":[0,-0.667,0]},{"t":63,"s":[969,759,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":22,"ty":3,"nm":"c","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":34,"s":[1017,763,0],"to":[0,-1.667,0],"ti":[0,-0.5,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":38,"s":[1017,753,0],"to":[0,0.5,0],"ti":[0,-1.667,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":43,"s":[1017,766,0],"to":[0,1.667,0],"ti":[0,0.5,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":48,"s":[1017,763,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":52,"s":[1017,763,0],"to":[0,-0.667,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":1},"o":{"x":0.333,"y":0},"t":58,"s":[1017,759,0],"to":[0,0,0],"ti":[0,-0.667,0]},{"t":63,"s":[1017,763,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":23,"ty":3,"nm":"g","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":36,"s":[1015,712,0],"to":[0,-1.667,0],"ti":[0,-0.5,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":40,"s":[1015,702,0],"to":[0,0.5,0],"ti":[0,-1.667,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":45,"s":[1015,715,0],"to":[0,1.667,0],"ti":[0,0.5,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":50,"s":[1015,712,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":54,"s":[1015,712,0],"to":[0,-0.667,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":1},"o":{"x":0.333,"y":0},"t":58,"s":[1015,708,0],"to":[0,0,0],"ti":[0,-0.667,0]},{"t":63,"s":[1015,712,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":24,"ty":3,"nm":"g","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":36,"s":[931,726,0],"to":[0,-1.667,0],"ti":[0,-0.5,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":40,"s":[931,716,0],"to":[0,0.5,0],"ti":[0,-1.667,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":45,"s":[931,729,0],"to":[0,1.667,0],"ti":[0,0.5,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":50,"s":[931,726,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":54,"s":[931,726,0],"to":[0,-0.667,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":1},"o":{"x":0.333,"y":0},"t":58,"s":[931,722,0],"to":[0,0,0],"ti":[0,-0.667,0]},{"t":63,"s":[931,726,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":25,"ty":3,"nm":"c","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":38,"s":[955,679,0],"to":[0,-1.667,0],"ti":[0,-0.5,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":42,"s":[955,669,0],"to":[0,0.5,0],"ti":[0,-1.667,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":47,"s":[955,682,0],"to":[0,1.667,0],"ti":[0,0.5,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":52,"s":[955,679,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":56,"s":[955,679,0],"to":[0,-0.667,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":1},"o":{"x":0.333,"y":0},"t":58,"s":[955,675,0],"to":[0,0,0],"ti":[0,-0.667,0]},{"t":63,"s":[955,679,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":26,"ty":3,"nm":"c","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":38,"s":[1025,686,0],"to":[0,-1.667,0],"ti":[0,-0.5,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":42,"s":[1025,676,0],"to":[0,0.5,0],"ti":[0,-1.667,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":47,"s":[1025,689,0],"to":[0,1.667,0],"ti":[0,0.5,0]},{"i":{"x":0.667,"y":0.667},"o":{"x":0.333,"y":0.333},"t":52,"s":[1025,686,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":56,"s":[1025,686,0],"to":[0,-0.667,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":1},"o":{"x":0.333,"y":0},"t":58,"s":[1025,682,0],"to":[0,0,0],"ti":[0,-0.667,0]},{"t":63,"s":[1025,686,0]}],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":27,"ty":3,"nm":"b","parent":9,"sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":0,"k":[142,-112,0],"l":2},"a":{"a":0,"k":[49,52,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":28,"ty":4,"nm":"s","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-122,94,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-1.466,-2.97],[0,0],[-1.301,-0.189],[0,0],[2.372,-2.313],[0,0],[-0.223,-1.297],[0,0],[2.932,1.542],[0,0],[1.165,-0.612],[0,0],[-0.559,3.265],[0,0],[0.941,0.918],[0,0],[-3.278,0.476],[0,0],[-0.582,1.179],[0,0]],"o":[[0,0],[0.582,1.179],[0,0],[3.278,0.476],[0,0],[-0.942,0.918],[0,0],[0.56,3.265],[0,0],[-1.164,-0.612],[0,0],[-2.932,1.542],[0,0],[0.222,-1.297],[0,0],[-2.372,-2.313],[0,0],[1.302,-0.189],[0,0],[1.466,-2.97]],"v":[[3.584,-16.859],[6.572,-10.804],[9.581,-8.618],[16.263,-7.647],[18.478,-0.83],[13.643,3.882],[12.494,7.42],[13.635,14.074],[7.836,18.287],[1.859,15.145],[-1.86,15.145],[-7.836,18.287],[-13.635,14.074],[-12.493,7.42],[-13.642,3.882],[-18.477,-0.83],[-16.262,-7.647],[-9.581,-8.618],[-6.572,-10.804],[-3.584,-16.859]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1131.528,497.634]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0.986,1.549],[0,0],[2.113,0],[0.423,-0.563],[0,0],[1.55,-0.282],[0,0],[0.282,-1.268],[-1.408,-1.268],[0,0],[0.705,-2.113],[0,0],[-1.691,-0.564],[-1.127,0.845],[0,0],[-0.563,-0.563],[0,0],[-0.704,0.845],[0.141,1.691],[0,0],[-1.127,1.127],[0,0],[1.127,1.408],[1.128,0.282]],"o":[[0,0],[-0.986,-1.55],[0,0],[-2.113,0],[-0.422,0.564],[0,0],[-1.549,0.282],[0,0],[-0.282,1.268],[1.409,1.268],[0,0],[-0.704,2.113],[0,0],[1.69,0.563],[1.127,-0.845],[0,0],[0.564,0.564],[0,0],[0.705,-0.845],[-0.141,-1.69],[0,0],[1.128,-1.127],[0,0],[-1.127,-1.409],[-1.126,-0.281]],"v":[[8.425,-8.645],[6.128,-11.128],[3.31,-17.187],[-0.212,-18.878],[-3.734,-16.623],[-7.256,-9.721],[-10.637,-8.312],[-16.835,-7.326],[-19.512,-4.789],[-18.667,-0.422],[-13.454,4.367],[-12.75,8.031],[-13.595,14.37],[-12.186,18.315],[-6.974,18.032],[-1.339,14.933],[2.042,15.638],[7.959,18.596],[12.185,17.891],[13.453,14.229],[12.326,7.185],[13.312,4.086],[19.229,-1.549],[18.948,-5.352],[15.566,-7.466]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1131.759,497.456]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":39,"op":49,"st":0},{"ind":29,"ty":4,"nm":"s","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[219,68,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-1.466,-2.97],[0,0],[-1.302,-0.189],[0,0],[2.372,-2.312],[0,0],[-0.222,-1.297],[0,0],[2.932,1.542],[0,0],[1.165,-0.612],[0,0],[-0.559,3.265],[0,0],[0.942,0.918],[0,0],[-3.278,0.476],[0,0],[-0.582,1.179],[0,0]],"o":[[0,0],[0.582,1.179],[0,0],[3.278,0.476],[0,0],[-0.942,0.918],[0,0],[0.56,3.265],[0,0],[-1.164,-0.612],[0,0],[-2.932,1.542],[0,0],[0.222,-1.297],[0,0],[-2.372,-2.312],[0,0],[1.302,-0.189],[0,0],[1.466,-2.97]],"v":[[3.584,-16.859],[6.572,-10.804],[9.581,-8.618],[16.263,-7.647],[18.478,-0.831],[13.643,3.882],[12.493,7.42],[13.635,14.074],[7.836,18.287],[1.859,15.145],[-1.86,15.145],[-7.836,18.287],[-13.635,14.074],[-12.493,7.42],[-13.643,3.882],[-18.477,-0.831],[-16.262,-7.647],[-9.581,-8.618],[-6.572,-10.804],[-3.584,-16.859]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[790.365,522.523]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0.986,1.549],[0,0],[2.113,0],[0.423,-0.563],[0,0],[1.55,-0.282],[0,0],[0.282,-1.268],[-1.409,-1.268],[0,0],[0.704,-2.113],[0,0],[-1.691,-0.564],[-1.127,0.845],[0,0],[-0.563,-0.563],[0,0],[-0.704,0.845],[0.141,1.691],[0,0],[-1.127,1.127],[0,0],[1.127,1.409],[1.127,0.282]],"o":[[0,0],[-0.987,-1.55],[0,0],[-2.113,0],[-0.422,0.564],[0,0],[-1.549,0.282],[0,0],[-0.282,1.268],[1.409,1.268],[0,0],[-0.704,2.113],[0,0],[1.69,0.563],[1.127,-0.845],[0,0],[0.564,0.564],[0,0],[0.705,-0.845],[-0.141,-1.69],[0,0],[1.127,-1.127],[0,0],[-1.127,-1.408],[-1.127,-0.281]],"v":[[8.426,-8.645],[6.129,-11.128],[3.311,-17.187],[-0.211,-18.878],[-3.733,-16.623],[-7.255,-9.721],[-10.636,-8.312],[-16.834,-7.326],[-19.511,-4.789],[-18.666,-0.422],[-13.453,4.367],[-12.749,8.031],[-13.594,14.37],[-12.185,18.315],[-6.973,18.032],[-1.338,14.933],[2.043,15.638],[7.96,18.596],[12.186,17.891],[13.454,14.229],[12.327,7.185],[13.313,4.086],[19.23,-1.549],[18.948,-5.354],[15.567,-7.466]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[790.595,522.345]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":39,"op":49,"st":0},{"ind":30,"ty":4,"nm":"s","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-13,-288,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-1.466,-2.97],[0,0],[-1.301,-0.189],[0,0],[2.372,-2.312],[0,0],[-0.222,-1.297],[0,0],[2.932,1.542],[0,0],[1.165,-0.612],[0,0],[-0.56,3.265],[0,0],[0.942,0.918],[0,0],[-3.278,0.476],[0,0],[-0.582,1.179],[0,0]],"o":[[0,0],[0.582,1.179],[0,0],[3.278,0.476],[0,0],[-0.942,0.918],[0,0],[0.56,3.265],[0,0],[-1.164,-0.612],[0,0],[-2.932,1.542],[0,0],[0.222,-1.297],[0,0],[-2.372,-2.312],[0,0],[1.302,-0.189],[0,0],[1.466,-2.97]],"v":[[3.583,-16.859],[6.571,-10.804],[9.58,-8.618],[16.262,-7.647],[18.477,-0.831],[13.642,3.882],[12.492,7.42],[13.634,14.074],[7.835,18.287],[1.859,15.145],[-1.861,15.145],[-7.837,18.287],[-13.635,14.074],[-12.494,7.42],[-13.644,3.882],[-18.478,-0.831],[-16.263,-7.647],[-9.582,-8.618],[-6.573,-10.804],[-3.585,-16.859]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1021.652,878.862]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0.986,1.549],[0,0],[2.113,0],[0.423,-0.563],[0,0],[1.55,-0.282],[0,0],[0.282,-1.268],[-1.408,-1.268],[0,0],[0.705,-2.113],[0,0],[-1.691,-0.564],[-1.127,0.845],[0,0],[-0.563,-0.563],[0,0],[-0.704,0.845],[0.141,1.691],[0,0],[-1.127,1.127],[0,0],[1.127,1.409],[1.128,0.282]],"o":[[0,0],[-0.986,-1.55],[0,0],[-2.113,0],[-0.422,0.564],[0,0],[-1.549,0.282],[0,0],[-0.282,1.268],[1.409,1.268],[0,0],[-0.704,2.113],[0,0],[1.69,0.563],[1.127,-0.845],[0,0],[0.564,0.564],[0,0],[0.705,-0.845],[-0.141,-1.69],[0,0],[1.128,-1.127],[0,0],[-1.127,-1.408],[-1.126,-0.281]],"v":[[8.425,-8.645],[6.128,-11.128],[3.31,-17.187],[-0.212,-18.878],[-3.734,-16.623],[-7.256,-9.721],[-10.637,-8.312],[-16.835,-7.326],[-19.512,-4.789],[-18.667,-0.423],[-13.454,4.367],[-12.75,8.03],[-13.595,14.37],[-12.186,18.315],[-6.974,18.032],[-1.339,14.933],[2.042,15.638],[7.959,18.596],[12.185,17.891],[13.453,14.228],[12.326,7.185],[13.312,4.086],[19.229,-1.549],[18.948,-5.354],[15.566,-7.466]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1021.883,878.685]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":39,"op":49,"st":0},{"ind":31,"ty":4,"nm":"s","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-198,-141,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-2.137,-2.531],[0,0],[-1.309,0.129],[0,0],[1.747,-2.815],[0,0],[-0.528,-1.205],[0,0],[3.216,0.791],[0,0],[0.983,-0.874],[0,0],[0.241,3.304],[0,0],[1.135,0.665],[0,0],[-3.068,1.25],[0,0],[-0.281,1.285],[0,0]],"o":[[0,0],[0.848,1.005],[0,0],[3.296,-0.326],[0,0],[-0.694,1.118],[0,0],[1.328,3.035],[0,0],[-1.277,-0.315],[0,0],[-2.476,2.201],[0,0],[-0.096,-1.311],[0,0],[-2.858,-1.674],[0,0],[1.218,-0.497],[0,0],[0.709,-3.236]],"v":[[0.182,-18.266],[4.538,-13.106],[7.984,-11.707],[14.703,-12.371],[18.491,-6.286],[14.931,-0.55],[14.666,3.16],[17.373,9.345],[12.757,14.829],[6.201,13.216],[2.59,14.109],[-2.455,18.596],[-9.096,15.9],[-9.588,9.166],[-11.554,6.009],[-17.38,2.596],[-16.868,-4.553],[-10.616,-7.101],[-8.221,-9.947],[-6.775,-16.542]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1206.516,732.392]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[1.33,1.267],[0,0],[2.051,-0.508],[0.275,-0.649],[0,0],[1.436,-0.646],[0,0],[-0.031,-1.298],[-1.672,-0.892],[0,0],[0.176,-2.221],[0,0],[-1.776,-0.141],[-0.891,1.092],[0,0],[-0.683,-0.412],[0,0],[-0.48,0.99],[0.544,1.607],[0,0],[-0.823,1.365],[0,0],[1.433,1.096],[1.162,0.003]],"o":[[0,0],[-1.33,-1.268],[0,0],[-2.051,0.508],[-0.275,0.648],[0,0],[-1.437,0.646],[0,0],[0.031,1.299],[1.672,0.892],[0,0],[-0.176,2.22],[0,0],[1.776,0.14],[0.891,-1.091],[0,0],[0.682,0.411],[0,0],[0.481,-0.989],[-0.543,-1.607],[0,0],[0.823,-1.365],[0,0],[-1.433,-1.097],[-1.162,-0.002]],"v":[[6.892,-11.449],[4.065,-13.308],[-0.126,-18.511],[-3.951,-19.306],[-6.828,-16.271],[-8.587,-8.724],[-11.53,-6.544],[-17.31,-4.097],[-19.299,-0.992],[-17.429,3.044],[-11.218,6.441],[-9.654,9.827],[-8.951,16.184],[-6.635,19.674],[-1.643,18.147],[3.082,13.784],[6.533,13.656],[12.987,15.105],[16.92,13.405],[17.27,9.545],[14.483,2.979],[14.696,-0.267],[19.085,-7.159],[17.897,-10.783],[14.107,-12.022]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1206.661,732.158]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":40,"op":50,"st":0},{"ind":32,"ty":4,"nm":"s","parent":5,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[5,134,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-2.137,-2.531],[0,0],[-1.309,0.129],[0,0],[1.747,-2.815],[0,0],[-0.528,-1.205],[0,0],[3.216,0.791],[0,0],[0.983,-0.874],[0,0],[0.241,3.304],[0,0],[1.135,0.665],[0,0],[-3.067,1.25],[0,0],[-0.281,1.285],[0,0]],"o":[[0,0],[0.848,1.005],[0,0],[3.296,-0.326],[0,0],[-0.694,1.118],[0,0],[1.328,3.035],[0,0],[-1.277,-0.315],[0,0],[-2.476,2.201],[0,0],[-0.096,-1.311],[0,0],[-2.858,-1.674],[0,0],[1.218,-0.497],[0,0],[0.709,-3.236]],"v":[[0.182,-18.266],[4.538,-13.106],[7.984,-11.707],[14.703,-12.371],[18.491,-6.287],[14.931,-0.551],[14.666,3.16],[17.373,9.345],[12.757,14.829],[6.201,13.215],[2.59,14.109],[-2.455,18.595],[-9.096,15.9],[-9.588,9.165],[-11.554,6.009],[-17.38,2.595],[-16.868,-4.553],[-10.616,-7.102],[-8.221,-9.947],[-6.775,-16.543]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1003.018,457.183]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[1.33,1.267],[0,0],[2.051,-0.508],[0.275,-0.649],[0,0],[1.436,-0.646],[0,0],[-0.031,-1.298],[-1.672,-0.892],[0,0],[0.176,-2.221],[0,0],[-1.776,-0.141],[-0.891,1.092],[0,0],[-0.683,-0.412],[0,0],[-0.48,0.99],[0.544,1.607],[0,0],[-0.823,1.365],[0,0],[1.433,1.096],[1.162,0.003]],"o":[[0,0],[-1.33,-1.268],[0,0],[-2.051,0.508],[-0.275,0.648],[0,0],[-1.437,0.646],[0,0],[0.031,1.299],[1.673,0.892],[0,0],[-0.176,2.22],[0,0],[1.776,0.14],[0.891,-1.091],[0,0],[0.682,0.411],[0,0],[0.481,-0.989],[-0.543,-1.607],[0,0],[0.823,-1.365],[0,0],[-1.433,-1.097],[-1.161,-0.002]],"v":[[6.892,-11.449],[4.065,-13.308],[-0.126,-18.511],[-3.951,-19.306],[-6.828,-16.271],[-8.587,-8.724],[-11.53,-6.544],[-17.31,-4.097],[-19.299,-0.992],[-17.429,3.044],[-11.218,6.441],[-9.654,9.827],[-8.951,16.184],[-6.635,19.674],[-1.643,18.147],[3.082,13.785],[6.533,13.656],[12.987,15.105],[16.92,13.405],[17.27,9.545],[14.483,2.979],[14.696,-0.267],[19.085,-7.159],[17.897,-10.783],[14.107,-12.022]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1003.163,456.949]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":40,"op":50,"st":0},{"ind":33,"ty":4,"nm":"s","parent":6,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[183,-251,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-2.137,-2.531],[0,0],[-1.309,0.129],[0,0],[1.747,-2.815],[0,0],[-0.528,-1.205],[0,0],[3.216,0.791],[0,0],[0.983,-0.874],[0,0],[0.241,3.304],[0,0],[1.135,0.665],[0,0],[-3.067,1.25],[0,0],[-0.281,1.285],[0,0]],"o":[[0,0],[0.848,1.005],[0,0],[3.296,-0.326],[0,0],[-0.694,1.118],[0,0],[1.328,3.035],[0,0],[-1.277,-0.315],[0,0],[-2.476,2.201],[0,0],[-0.096,-1.312],[0,0],[-2.858,-1.674],[0,0],[1.218,-0.497],[0,0],[0.709,-3.236]],"v":[[0.182,-18.266],[4.538,-13.107],[7.984,-11.708],[14.703,-12.372],[18.491,-6.287],[14.931,-0.551],[14.666,3.159],[17.373,9.344],[12.757,14.828],[6.201,13.215],[2.59,14.109],[-2.455,18.595],[-9.096,15.899],[-9.588,9.165],[-11.554,6.008],[-17.38,2.595],[-16.868,-4.554],[-10.616,-7.102],[-8.221,-9.948],[-6.775,-16.543]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[826.073,843.483]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[1.33,1.267],[0,0],[2.051,-0.508],[0.275,-0.649],[0,0],[1.436,-0.646],[0,0],[-0.031,-1.298],[-1.672,-0.892],[0,0],[0.176,-2.221],[0,0],[-1.776,-0.141],[-0.891,1.092],[0,0],[-0.683,-0.411],[0,0],[-0.48,0.99],[0.544,1.607],[0,0],[-0.823,1.365],[0,0],[1.433,1.096],[1.162,0.003]],"o":[[0,0],[-1.33,-1.268],[0,0],[-2.051,0.508],[-0.275,0.648],[0,0],[-1.437,0.646],[0,0],[0.031,1.299],[1.673,0.892],[0,0],[-0.176,2.22],[0,0],[1.776,0.14],[0.891,-1.091],[0,0],[0.682,0.412],[0,0],[0.481,-0.989],[-0.543,-1.607],[0,0],[0.823,-1.365],[0,0],[-1.433,-1.097],[-1.162,-0.002]],"v":[[6.892,-11.449],[4.065,-13.308],[-0.126,-18.511],[-3.951,-19.306],[-6.828,-16.271],[-8.587,-8.724],[-11.53,-6.544],[-17.31,-4.097],[-19.299,-0.992],[-17.429,3.044],[-11.218,6.441],[-9.654,9.827],[-8.951,16.184],[-6.635,19.674],[-1.643,18.147],[3.082,13.784],[6.533,13.655],[12.987,15.105],[16.92,13.405],[17.27,9.545],[14.483,2.979],[14.696,-0.267],[19.085,-7.159],[17.897,-10.783],[14.107,-12.022]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[826.218,843.248]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":40,"op":50,"st":0},{"ind":34,"ty":4,"nm":"s","parent":7,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-24,-71,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-2.887,-13.663]],"o":[[14.055,2.969],[0,0]],"v":[[-12.203,-13.299],[12.203,13.299]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1022.756,676.426]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-13.603,2.79]],"o":[[2.906,-13.951],[0,0]],"v":[[-11.693,13.585],[11.693,-13.584]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1046.801,676.14]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[2.887,13.662]],"o":[[-14.055,-2.969],[0,0]],"v":[[12.472,11.971],[-12.472,-11.971]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1046.023,650.585]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[13.603,-2.79]],"o":[[-2.906,13.951],[0,0]],"v":[[11.426,-12.251],[-11.425,12.251]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1021.978,650.875]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[2.518,1.139],[2.755,3.369],[0.956,4.707],[0.234,-0.024],[4.601,-4.339],[4.891,-1.655],[-4.14,-4.891],[-1.773,-6.039],[-0.293,0.019],[-2.404,4.223],[-7.336,2.215],[-0.049,0.218]],"o":[[-3.961,-1.792],[-2.999,-3.669],[-0.217,0.049],[-0.438,6.266],[-3.404,3.211],[5.775,1.396],[4.201,4.965],[0.267,-0.056],[0.658,-4.272],[3.85,-6.766],[0.022,-0.223],[-2.523,-0.434]],"v":[[15.656,-4.367],[5.309,-12.227],[-0.689,-25.093],[-1.363,-24.98],[-9.593,-8.044],[-23.102,-1.03],[-7.773,8.232],[0.268,25.093],[0.61,24.984],[5.448,12.271],[23.081,-1.535],[22.804,-1.808]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1034.497,664.127]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":42,"op":52,"st":0},{"ind":35,"ty":4,"nm":"s","parent":8,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[103,-177,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-2.887,-13.663]],"o":[[14.055,2.969],[0,0]],"v":[[-12.203,-13.299],[12.203,13.299]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[895.756,782.426]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-13.603,2.79]],"o":[[2.906,-13.951],[0,0]],"v":[[-11.693,13.585],[11.693,-13.584]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.801,782.14]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[2.887,13.662]],"o":[[-14.055,-2.969],[0,0]],"v":[[12.471,11.971],[-12.472,-11.971]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.023,756.585]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[13.603,-2.79]],"o":[[-2.906,13.951],[0,0]],"v":[[11.426,-12.251],[-11.425,12.251]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[894.978,756.875]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[2.518,1.139],[2.755,3.369],[0.957,4.707],[0.234,-0.024],[4.602,-4.339],[4.891,-1.655],[-4.14,-4.891],[-1.772,-6.039],[-0.293,0.019],[-2.403,4.223],[-7.336,2.215],[-0.049,0.218]],"o":[[-3.961,-1.792],[-2.999,-3.669],[-0.217,0.049],[-0.438,6.266],[-3.404,3.211],[5.776,1.396],[4.201,4.965],[0.268,-0.056],[0.658,-4.272],[3.85,-6.766],[0.022,-0.223],[-2.522,-0.434]],"v":[[15.656,-4.367],[5.309,-12.227],[-0.689,-25.093],[-1.363,-24.98],[-9.593,-8.044],[-23.102,-1.03],[-7.773,8.232],[0.268,25.093],[0.61,24.984],[5.448,12.271],[23.081,-1.535],[22.804,-1.808]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[907.497,770.127]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":45,"op":55,"st":2},{"ind":36,"ty":4,"nm":"h","parent":10,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[75,-146,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.398],[4.398,0],[0,4.398],[-4.398,0]],"o":[[0,4.398],[-4.398,0],[0,-4.398],[4.398,0]],"v":[[7.963,0],[0,7.963],[-7.963,0],[0,-7.963]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[934.796,738.397]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-9.856],[9.458,0],[0,9.856],[-9.458,0]],"o":[[0,9.856],[-9.458,0],[0,-9.856],[9.458,0]],"v":[[17.125,0],[0,17.846],[-17.125,0],[0,-17.846]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[932.888,738.574]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.357],[4.095,0],[0,4.725],[-4.096,0]],"o":[[0,4.378],[-4.096,0],[0,-4.634],[4.095,0]],"v":[[7.963,0.098],[0.068,7.963],[-7.963,0],[0.068,-7.963]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[1,0.878,0.839,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[934.796,738.397]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.031],[4.032,0],[0,4.031],[-4.031,0]],"o":[[0,4.031],[-4.031,0],[0,-4.031],[4.032,0]],"v":[[7.299,-0.001],[-0.001,7.299],[-7.3,-0.001],[-0.001,-7.299]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[933.962,738.702]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-9.529],[9.162,0],[0,9.529],[-9.162,0]],"o":[[0,9.529],[-9.162,0],[0,-9.529],[9.162,0]],"v":[[17.125,-0.177],[-0.083,17.846],[-17.125,-0.177],[-0.083,-17.845]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[1,0.878,0.839,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[932.888,738.574]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":38,"st":0},{"ind":37,"ty":4,"nm":"h","parent":11,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[77,-146,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-5.016,-3.878]],"o":[[5.016,-1.856],[0,0]],"v":[[-7.524,-0.588],[7.524,2.444]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[929.987,753.851]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-3.731,-4.4]],"o":[[1.774,10.592],[0,0]],"v":[[-4.323,-10.629],[4.323,10.629]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[945.755,733.21]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-0.781,6.685]],"o":[[4.838,-2.979],[0,0]],"v":[[-4.214,7.249],[4.214,-7.248]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.522,729.829]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-11.348,-11.45],[5.119,-5.074],[11.048,11.146],[16.289,12.664]],"o":[[22.889,23.251],[11.348,11.449],[-5.119,5.073],[-11.047,-11.147],[0,0]],"v":[[-20.161,-31.188],[21.382,-0.539],[23.227,24.845],[-1.323,20.042],[-32.731,-18.731]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[970.24,775.026]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[14.744,-6.517],[2.914,6.592],[-14.353,6.345],[-17.64,10.701]],"o":[[-29.886,13.09],[-14.744,6.518],[-2.914,-6.592],[14.354,-6.346],[0,0]],"v":[[35.368,-9.107],[-8.083,18.773],[-32.455,11.443],[-19.211,-9.778],[28.213,-25.292]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[887.094,762.369]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,16.12],[-7.208,0],[0,-15.694],[-2.655,-20.461]],"o":[[0.111,-32.627],[0,-16.12],[7.207,0],[0,15.693],[0,0]],"v":[[-7.374,35.17],[-15.306,-15.843],[1.253,-35.171],[15.307,-14.477],[10.322,35.17]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[931.11,687.411]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-9.468,-12.012],[-4.525,-2.95],[-6.391,8.121],[3.693,4.101],[2.867,2.283],[2.387,1.824],[0,0],[0,0]],"o":[[7.57,-2.202],[3.264,7.733],[4.524,2.951],[6.39,-8.121],[-3.692,-4.101],[-2.867,-2.284],[-2.387,-1.824],[0,0],[0,0]],"v":[[-38.034,-19.5],[-10.472,0.539],[11.962,27.967],[31.644,26.592],[32.603,6.389],[24.931,-0.95],[3.06,-13.607],[-13.692,-28.254],[-30.464,-34.713]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[962.937,771.79]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[8.353,-0.835],[4.437,-3.08],[-5.116,-8.979],[-5.189,1.876],[-3.195,1.796],[-2.589,1.525],[-5.172,1.795],[0,0]],"o":[[0,0],[-8.352,0.836],[-4.437,3.08],[5.116,8.978],[5.19,-1.876],[3.194,-1.795],[9.339,-5.607],[0,0],[0,0]],"v":[[24.733,-24.106],[3.732,-14.844],[-28.971,-5.03],[-35.877,15.128],[-16.755,22.106],[-7.066,18.513],[11.511,3.018],[33.422,-8.217],[40.993,-23.502]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[891.481,760.579]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-4.253,29.44],[0.995,5.309],[10.285,-0.995],[0.411,-5.503],[-0.332,-3.65],[-0.331,-2.986],[0,0],[0,0]],"o":[[0,0],[2.655,-7.963],[-0.996,-5.309],[-10.286,0.996],[-0.411,5.503],[0.332,3.649],[5.569,35.238],[0,0],[0,0]],"v":[[16.969,45.869],[9.486,3.568],[13.8,-31.602],[-0.799,-44.874],[-16.062,-31.602],[-16.062,-20.984],[-10.09,3.568],[-16.969,39.411],[0.196,39.411]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[932.277,697.667]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":38,"st":0},{"ind":38,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.479,1.659],[4.479,-1.659]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1036.159,651.134]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.325,7.335],[2.325,-7.335]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1023.057,637.495]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.038,-4.049],[1.038,4.049]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1032.689,717.29]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-0.774,-7.576],[0.774,7.576]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1019.072,725.07]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[4.645,-5.143],[-4.645,5.143]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[988.879,713.899]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.853,-0.829],[-7.853,0.83]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[980.474,678.805]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6.475,5.812],[-6.475,-5.811]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[991.694,644.438]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.953,1.294],[-7.953,-1.294]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.912,660.899]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.878,7.12],[2.878,-7.12]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1001.042,724.724]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[3.081,8.57],[-3.081,-8.57]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1006.038,632.61]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.791,3.087],[7.791,-3.087]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.079,694.917]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":7,"st":0},{"ind":39,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0.791,3.1]],"o":[[-0.79,-3.1],[0,0]],"v":[[1.186,4.651],[-1.186,-4.65]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1032.154,717.769]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0.572,5.215]],"o":[[-0.571,-5.215],[0,0]],"v":[[0.857,7.823],[-0.857,-7.823]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1018.215,725.065]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.042,7.306],[3.041,-7.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1000.26,724.191]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-3.155,3.343]],"o":[[3.156,-3.343],[0,0]],"v":[[-4.733,5.014],[4.734,-5.014]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[988.646,712.59]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.766,3.026],[7.766,-3.026]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.054,693.638]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-5.08,0.535]],"o":[[5.08,-0.535],[0,0]],"v":[[-7.62,0.803],[7.62,-0.803]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[980.571,677.81]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[3.219,-1.199]],"o":[[-3.218,1.199],[0,0]],"v":[[4.828,-1.798],[-4.828,1.798]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1037.177,652.047]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[1.7,-4.695]],"o":[[-1.7,4.696],[0,0]],"v":[[2.55,-7.044],[-2.55,7.044]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1024.035,637.84]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-1.697,-5.769]],"o":[[1.697,5.769],[0,0]],"v":[[-2.545,-8.653],[2.545,8.653]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1007.087,632.282]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-4.362,-3.998]],"o":[[4.363,3.998],[0,0]],"v":[[-6.544,-5.996],[6.544,5.997]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[991.919,643.492]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-5.417,-0.993]],"o":[[5.417,0.993],[0,0]],"v":[[-8.126,-1.489],[8.126,1.489]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.839,659.713]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":7,"op":8,"st":0},{"ind":40,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.215,-4.814],[1.215,4.813]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1031.072,718.713]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-0.796,-8.146],[0.796,8.146]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1016.246,725.64]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[3.128,-7.241],[-3.128,7.241]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[999.136,723.526]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[5.374,-5.319],[-5.374,5.319]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[987.936,711.05]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.636,2.969],[7.636,-2.969]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[982.562,691.948]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.58,-0.387],[-7.58,0.386]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[980.748,676.188]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[8.005,1.923],[-8.006,-1.923]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[984.574,657.948]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.977,1.818],[4.977,-1.819]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1037.666,653.662]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.779,6.854],[2.779,-6.854]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1025.836,639.26]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.989,-8.776],[1.989,8.776]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1008.789,632.405]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6.255,6.514],[-6.255,-6.514]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[993.31,641.664]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":8,"op":9,"st":0},{"ind":41,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.353,-2.221],[1.353,2.22]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1037.389,711.679]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.323,-6.161],[1.323,6.161]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1026.705,721.334]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0.64,-8.829],[-0.64,8.829]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1010.138,726.323]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.618,7.148],[3.618,-7.148]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[995.312,720.39]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-6.48,4.253],[6.48,-4.253]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[985.385,704.503]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.673,-2.302],[-7.673,2.302]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[981.206,686.676]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.475,0.488],[-7.475,-0.488]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[981.404,669.44]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.588,3.638],[-7.588,-3.638]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[987.055,651.843]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-5.403,0.885],[5.403,-0.885]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1038.742,659.097]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.332,4.776],[3.333,-4.776]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1030.535,643.402]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1015.45,641.18],[1015.45,625.096]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[4.716,7.889],[-4.717,-7.889]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[998.24,636.548]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":9,"op":10,"st":0},{"ind":42,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-0.952,-4.203],[0.952,4.203]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1034.291,715.881]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-0.979,-6.984],[0.979,6.984]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1021.475,724.274]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[2.498,-7.569],[-2.498,7.57]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1003.54,725.759]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.697,5.621],[4.697,-5.62]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[990.615,715.713]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.867,3.537],[7.867,-3.537]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.827,697.397]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.56,-1.222],[-7.56,1.221]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[980.767,681.101]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.791,1.089],[-7.791,-1.089]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.078,663.283]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6.894,5.473],[-6.894,-5.473]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[989.972,646.37]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[3.726,8.524],[-3.726,-8.525]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1003.926,633.621]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.708,2.368],[4.708,-2.368]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1035.243,648.766]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.992,7.469],[1.992,-7.469]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1021.065,635.629]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":10,"op":11,"st":0},{"ind":43,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[3.216,-1.215]],"o":[[-3.216,1.215],[0,0]],"v":[[4.824,-1.823],[-4.825,1.823]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1036.38,650.589]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[1.476,-5.124]],"o":[[-1.476,5.124],[0,0]],"v":[[2.214,-7.686],[-2.214,7.686]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1022.414,636.844]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-2.129,-5.705]],"o":[[2.128,5.704],[0,0]],"v":[[-3.192,-8.557],[3.193,8.557]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1005.399,632.774]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-6.634,-5.964],[6.634,5.964]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[990.867,645.17]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-8.203,-1.328],[8.203,1.328]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.491,661.954]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.609,1.148],[7.608,-1.148]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[980.719,679.953]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.702,3.25],[7.703,-3.25]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.167,695.88]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.895,5.492],[4.895,-5.492]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[989.59,714.249]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0.63,2.816]],"o":[[-0.63,-2.816],[0,0]],"v":[[0.944,4.224],[-0.945,-4.224]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1033.347,717.115]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0.83,7.427],[-0.83,-7.427]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1019.902,724.717]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.812,7.521],[2.812,-7.521]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1002.207,725.125]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":11,"op":14,"st":0},{"ind":44,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-0.952,-4.203],[0.952,4.203]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1034.291,715.881]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-0.979,-6.984],[0.979,6.984]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1021.475,724.274]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[2.498,-7.569],[-2.498,7.57]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1003.54,725.759]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.697,5.621],[4.697,-5.62]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[990.615,715.713]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.867,3.537],[7.867,-3.537]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.827,697.397]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.56,-1.222],[-7.56,1.221]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[980.767,681.101]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.791,1.089],[-7.791,-1.089]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.078,663.283]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6.894,5.473],[-6.894,-5.473]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[989.972,646.37]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[3.726,8.524],[-3.726,-8.525]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1003.926,633.621]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.708,2.368],[4.708,-2.368]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1035.243,648.766]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.992,7.469],[1.992,-7.469]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1021.065,635.629]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":14,"op":15,"st":1},{"ind":45,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.353,-2.221],[1.353,2.22]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1037.389,711.679]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.323,-6.161],[1.323,6.161]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1026.705,721.334]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0.64,-8.829],[-0.64,8.829]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1010.138,726.323]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.618,7.148],[3.618,-7.148]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[995.312,720.39]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-6.48,4.253],[6.48,-4.253]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[985.385,704.503]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.673,-2.302],[-7.673,2.302]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[981.206,686.676]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.475,0.488],[-7.475,-0.488]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[981.404,669.44]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.588,3.638],[-7.588,-3.638]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[987.055,651.843]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-5.403,0.885],[5.403,-0.885]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1038.742,659.097]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.332,4.776],[3.333,-4.776]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1030.535,643.402]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1015.45,641.18],[1015.45,625.096]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[4.716,7.889],[-4.717,-7.889]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[998.24,636.548]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":15,"op":16,"st":1},{"ind":46,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.215,-4.814],[1.215,4.813]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1031.072,718.713]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-0.796,-8.146],[0.796,8.146]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1016.246,725.64]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[3.128,-7.241],[-3.128,7.241]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[999.136,723.526]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[5.374,-5.319],[-5.374,5.319]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[987.936,711.05]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.636,2.969],[7.636,-2.969]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[982.562,691.948]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.58,-0.387],[-7.58,0.386]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[980.748,676.188]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[8.005,1.923],[-8.006,-1.923]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[984.574,657.948]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.977,1.818],[4.977,-1.819]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1037.666,653.662]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.779,6.854],[2.779,-6.854]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1025.836,639.26]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.989,-8.776],[1.989,8.776]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1008.789,632.405]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6.255,6.514],[-6.255,-6.514]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[993.31,641.664]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":16,"op":17,"st":1},{"ind":47,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0.791,3.1]],"o":[[-0.79,-3.1],[0,0]],"v":[[1.186,4.651],[-1.186,-4.65]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1032.154,717.769]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0.572,5.215]],"o":[[-0.571,-5.215],[0,0]],"v":[[0.857,7.823],[-0.857,-7.823]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1018.215,725.065]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.042,7.306],[3.041,-7.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1000.26,724.191]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-3.155,3.343]],"o":[[3.156,-3.343],[0,0]],"v":[[-4.733,5.014],[4.734,-5.014]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[988.646,712.59]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.766,3.026],[7.766,-3.026]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.054,693.638]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-5.08,0.535]],"o":[[5.08,-0.535],[0,0]],"v":[[-7.62,0.803],[7.62,-0.803]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[980.571,677.81]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[3.219,-1.199]],"o":[[-3.218,1.199],[0,0]],"v":[[4.828,-1.798],[-4.828,1.798]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1037.177,652.047]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[1.7,-4.695]],"o":[[-1.7,4.696],[0,0]],"v":[[2.55,-7.044],[-2.55,7.044]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1024.035,637.84]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-1.697,-5.769]],"o":[[1.697,5.769],[0,0]],"v":[[-2.545,-8.653],[2.545,8.653]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1007.087,632.282]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-4.362,-3.998]],"o":[[4.363,3.998],[0,0]],"v":[[-6.544,-5.996],[6.544,5.997]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[991.919,643.492]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-5.417,-0.993]],"o":[[5.417,0.993],[0,0]],"v":[[-8.126,-1.489],[8.126,1.489]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.839,659.713]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":17,"op":18,"st":1},{"ind":48,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.479,1.659],[4.479,-1.659]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1036.159,651.134]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.325,7.335],[2.325,-7.335]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1023.057,637.495]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-1.038,-4.049],[1.038,4.049]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1032.689,717.29]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-0.774,-7.576],[0.774,7.576]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1019.072,725.07]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[4.645,-5.143],[-4.645,5.143]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[988.879,713.899]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.853,-0.829],[-7.853,0.83]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[980.474,678.805]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6.475,5.812],[-6.475,-5.811]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[991.694,644.438]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7.953,1.294],[-7.953,-1.294]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.912,660.899]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.878,7.12],[2.878,-7.12]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1001.042,724.724]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[3.081,8.57],[-3.081,-8.57]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1006.038,632.61]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7.791,3.087],[7.791,-3.087]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[983.079,694.917]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":18,"op":38,"st":0},{"ind":49,"ty":4,"nm":"d","parent":12,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-14,-92,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6.665,0.957],[-6.664,-0.957]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1027.203,706.13]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6.665,0.957],[-6.664,-0.957]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1029.857,659.181]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.761],[3.769,0],[0,5.761],[-3.769,0]],"o":[[0,5.761],[-3.769,0],[0,-5.761],[3.769,0]],"v":[[6.825,0],[0,10.431],[-6.824,0],[0,-10.431]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1037.321,683.429]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-13.072],[8.552,0],[0,13.072],[-8.551,0]],"o":[[0,13.072],[-8.551,0],[0,-13.072],[8.552,0]],"v":[[15.484,0],[0,23.668],[-15.484,0],[0,-23.668]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1036.521,683.806]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,13.071],[-8.552,0]],"o":[[-8.552,0],[0,-13.072],[0,0]],"v":[[7.742,23.668],[-7.742,0],[7.742,-23.668]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1015.45,681.892]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.436],[3.543,0],[0,5.436],[-3.543,0]],"o":[[0,5.436],[-3.543,0],[0,-5.436],[3.543,0]],"v":[[6.71,-0.018],[0.295,10.414],[-6.711,0.022],[0.295,-10.414]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1037.246,683.446]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[3.273,-14.001],[-5.747,-3.465],[0,0],[-4.162,21.333]],"o":[[0,0],[0,0],[-3.546,15.293],[0,0],[0,0],[1.355,-12.273]],"v":[[14.16,-22.341],[2.215,-24.111],[-10.614,-8.184],[-0.882,22.341],[11.506,24.111],[2.658,-5.53]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1019.179,682.323]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-12.736],[8.612,0],[0,12.736],[-8.613,0]],"o":[[0,12.736],[-8.613,0],[0,-12.736],[8.612,0]],"v":[[15.969,0.078],[0.355,23.867],[-15.969,0.078],[-0.374,-23.867]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[1,0.878,0.839,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1036.036,683.738]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":38,"st":0},{"ind":50,"ty":4,"nm":"d","parent":13,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[4,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[4.583,-13.275]],"o":[[2.542,13.252],[0,0]],"v":[[0.512,-19.896],[-3.054,19.896]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1046.553,685.835]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,28.82],[-18.576,0]],"o":[[-21.899,0],[0,-27.109],[0,0]],"v":[[18.914,55.778],[-18.914,0.041],[14.936,-55.777]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[991.864,679.407]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[16.43,0],[0,30.982],[-23.579,0],[-4.672,-24.325]],"o":[[-7.138,17.878],[-23.579,0],[0,-30.982],[19.963,0],[0,0]],"v":[[38.479,26.023],[0.648,56.097],[-42.046,0],[0.648,-56.097],[42.046,-13.768]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1005.02,679.708]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-21.291,9.809],[10.312,-35.082],[-34.418,3.115],[2.873,51.821],[0,0]],"o":[[0,0],[-9.475,35.945],[-6.259,-0.27],[0.12,-0.832],[0,0]],"v":[[17.567,-57.392],[-17.659,-20.046],[27.134,54.277],[-10.362,-2.742],[-8.838,-17.97]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[983.312,681.355]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0.193,-30.602],[20.464,-2.017],[0,30.602],[-20.89,0]],"o":[[-0.188,29.712],[-20.79,2.049],[0,-30.602],[20.89,0]],"v":[[37.728,-0.737],[-0.096,54.673],[-37.921,-0.737],[-2.691,-56.721]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1010.542,680.406]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":38,"st":0},{"ind":51,"ty":4,"nm":"S","parent":14,"td":1,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":-1},"p":{"a":0,"k":[123,-275,0],"l":2},"a":{"a":0,"k":[0,0,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[84.5,50],[154.5,12],[215.5,368],[-60,378.5],[-57,107]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":0},"lc":1,"lj":1,"ml":4,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[1,0,0,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"S"}],"ip":0,"op":64,"st":0},{"ind":52,"ty":4,"nm":"b","parent":14,"tt":2,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[123,-278,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-7.14,2.542],[0,0]],"o":[[0,0],[0,7.579],[0,0],[0,0]],"v":[[-37.335,-28.415],[-37.335,15.542],[-22.69,25.873],[37.336,4.502]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[936.187,795.678]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.291,2.367],[0,0],[0,1.835],[0,0],[7.173,-2.712],[0,0],[0,-4.56],[0,0]],"o":[[0,0],[2.54,-0.905],[0,0],[0.879,-1.611],[0,0],[0,-7.67],[0,0],[-4.266,1.613],[0,0],[0,0]],"v":[[-6.066,107.801],[58.212,84.916],[64.161,79.836],[79.398,51.901],[80.737,46.65],[80.737,-94.83],[65.893,-105.089],[-73.649,-52.33],[-80.737,-42.073],[-80.737,74.884]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[979.588,692.379]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[-4.948,0],[0,5.222],[4.947,0]],"o":[[0,5.222],[4.947,0],[0,-5.223],[-4.948,0]],"v":[[-8.958,0],[0,9.456],[8.958,0],[0,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1024.823,530.913]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[-4.947,0],[0,5.222],[4.948,0]],"o":[[0,5.222],[4.948,0],[0,-5.223],[-4.947,0]],"v":[[-8.958,0],[-0.001,9.456],[8.958,0],[-0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[994.409,543.632]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[-4.947,0],[0,5.223],[4.948,0]],"o":[[0,5.223],[4.948,0],[0,-5.223],[-4.947,0]],"v":[[-8.958,0],[-0.001,9.456],[8.958,0],[-0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[959.459,556.904]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[-4.947,0],[0,5.223],[4.948,0]],"o":[[0,5.223],[4.948,0],[0,-5.223],[-4.947,0]],"v":[[-8.958,0],[-0.001,9.456],[8.958,0],[-0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[922.63,571.061]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[4.947,0],[0,5.223],[-4.948,0]],"o":[[0,5.223],[-4.948,0],[0,-5.223],[4.947,0]],"v":[[8.958,0],[0,9.456],[-8.959,0],[0,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[883.81,581.236]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[4.947,0],[0,5.223],[-4.948,0]],"o":[[0,5.223],[-4.948,0],[0,-5.223],[4.947,0]],"v":[[8.959,0],[0.001,9.456],[-8.958,0],[0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[847.091,567.964]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[4.947,0],[0,5.222],[-4.948,0]],"o":[[0,5.222],[-4.948,0],[0,-5.223],[4.947,0]],"v":[[8.959,0],[0.001,9.456],[-8.958,0],[0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[817.008,549.826]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[24.097,8.032],[-24.098,-8.032]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[874.007,510.924]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[6.025,-30.925],[-6.024,-0.402],[-2.812,30.925]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[872.802,510.522]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[4.82,-30.925],[24.098,8.434],[-4.016,30.925],[-24.097,-7.631]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[874.007,510.522]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-24.097,8.032],[24.097,-8.032]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[949.936,491.557]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-6.024,-30.925],[6.024,-0.402],[2.812,30.925]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[951.141,491.155]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-4.819,-30.925],[-24.097,8.434],[4.017,30.925],[24.098,-7.631]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[949.936,491.155]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-7.14,2.542],[0,0]],"o":[[0,0],[0,7.579],[0,0],[0,0]],"v":[[-37.335,-28.415],[-37.335,15.542],[-22.69,25.873],[37.336,4.502]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[936.187,795.678]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.291,2.367],[0,0],[0,1.835],[0,0],[7.173,-2.712],[0,0],[0,-4.56],[0,0]],"o":[[0,0],[2.54,-0.905],[0,0],[0.879,-1.611],[0,0],[0,-7.67],[0,0],[-4.266,1.613],[0,0],[0,0]],"v":[[-6.066,107.801],[58.212,84.916],[64.161,79.836],[79.398,51.901],[80.737,46.65],[80.737,-94.83],[65.893,-105.089],[-73.649,-52.33],[-80.737,-42.073],[-80.737,74.884]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[979.588,692.379]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[2.511,1.186],[0,0],[0.014,-5.253],[0,0],[-0.697,-1.119],[0,0],[-1.35,-0.593],[0,0],[0.024,5.187],[0,0]],"o":[[0,0],[-0.013,-2.719],[0,0],[-4.851,-2.292],[0,0],[-0.004,1.31],[0,0],[0.768,1.233],[0,0],[4.855,2.13],[0,0],[0,0]],"v":[[36.582,69.522],[36.067,-71.032],[31.943,-77.414],[-25.981,-104.779],[-36.488,-98.383],[-36.892,56.11],[-35.832,59.825],[-21.818,82.338],[-18.567,85.141],[26.552,104.94],[36.872,98.409],[36.734,69.522]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[831.343,714.552]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[6.464,0],[0,8.344],[-4.924,2.734]],"o":[[-4.668,2.091],[-15.026,0],[0,-4.172],[0,0]],"v":[[22.139,9.552],[5.069,12.895],[-22.138,-2.213],[-14.169,-12.895]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[808.179,817.41]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-1.373],[10.261,0],[0,7.513],[-0.705,1.437]],"o":[[0.516,1.249],[0,7.513],[-10.262,0],[0,-1.614],[0,0]],"v":[[17.786,-8.448],[18.58,-4.501],[0,9.102],[-18.581,-4.501],[-17.492,-9.102]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[812.805,836.023]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-3.305],[15.026,0],[4.978,3.561]],"o":[[3.243,2.487],[0,8.344],[-8.748,0],[0,0]],"v":[[19.204,-11.979],[24.358,-3.129],[-2.849,11.979],[-24.358,6.125]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1032.871,798.861]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-1.373],[10.261,0],[0,7.513],[-0.705,1.437]],"o":[[0.516,1.249],[0,7.513],[-10.262,0],[0,-1.614],[0,0]],"v":[[17.786,-8.448],[18.58,-4.501],[0,9.102],[-18.581,-4.501],[-17.492,-9.102]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1029.579,816.557]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-1.373],[10.262,0],[0,7.513],[-0.704,1.437]],"o":[[1.025,0.937],[0,7.513],[-10.262,0],[0,-1.615],[0,0]],"v":[[17.133,-9.102],[18.581,-4.501],[-0.001,9.102],[-18.581,-4.501],[-17.492,-9.101]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[886.686,868.317]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-2.311],[14.843,0],[0,8.613],[-1.156,1.076]],"o":[[1.554,1.973],[0,8.613],[-14.843,0],[0,-1.077],[0,0]],"v":[[24.455,-11.036],[26.875,-4.558],[0,11.036],[-26.875,-4.558],[-25.166,-9.239]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[886.64,851.548]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[883.81,845.788],[883.81,778.765]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[883.81,778.765],[883.81,630.937]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-41.838,-20.679],[0,0],[-13.667,5.067],[0,0],[45.715,17.404],[6.243,0.052]],"o":[[0,0],[-43.889,15.871],[0,0],[13.068,6.458],[0,0],[45.865,-17.004],[-5.927,-2.256],[0,0]],"v":[[-48.32,-39.792],[-53.245,-38.011],[-58.703,59.297],[-57.951,59.669],[-16.064,61.849],[54.392,35.727],[54.825,-63.452],[36.421,-66.916]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.482,494.565]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[5.964,-2.156],[0,0]],"o":[[-6.243,-0.052],[0,0],[0,0]],"v":[[42.371,-13.536],[23.911,-10.381],[-42.37,13.588]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[913.533,441.185]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-22.66,-11.2],[0,0],[-7.403,2.745],[0,0],[24.759,9.426],[0,0]],"o":[[0,0],[-23.77,8.596],[0,0],[7.078,3.498],[0,0],[24.84,-9.21],[0,0],[0,0]],"v":[[-92.612,-34.094],[-110.589,-27.593],[-113.545,25.109],[-52.348,55.356],[-29.661,56.536],[111.212,4.308],[111.446,-49.407],[85.514,-59.28]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[923.265,544.66]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-10.475,-5.177],[0,0],[-3.422,1.268],[0,0],[11.446,4.357],[0,0]],"o":[[0,0],[-10.989,3.973],[0,0],[3.272,1.617],[0,0],[11.483,-4.258],[0,0],[0,0]],"v":[[-130.762,-30.138],[-147.021,-24.258],[-148.388,0.104],[-48.788,49.332],[-38.301,49.878],[147.31,-18.937],[147.418,-43.768],[128.039,-51.146]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[925.005,580.174]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-17.728,-9.042],[0,0],[-13.831,5.068],[0,0],[0,22.215],[0,0]],"o":[[0,0],[0,19.9],[0,0],[13.122,6.693],[0,0],[20.858,-7.643],[0,0],[0,0]],"v":[[-146.322,-121.324],[-146.322,63.906],[-117.435,111.068],[-68.026,136.271],[-25.755,138.818],[111.596,88.488],[146.322,38.778],[146.322,-143.886]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[926.833,704.772]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[4.866,2.654],[0,0],[0.884,-7.078],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[-4.866,-2.655],[0,0],[-0.885,7.078],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[36.055,-65.032],[31.631,-76.534],[-27.65,-104.849],[-36.055,-98.654],[-36.498,57.511],[-21.456,84.497],[-11.281,89.806],[25.88,105.29],[33.843,105.733],[36.94,100.423]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.02,0.482,0.843,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[831.386,713.955]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-5.088,-31.084],[-23.226,8.079],[4.645,31.084],[23.225,-8.29]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[949.948,491.314]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-23.668,-6.232],[-3.135,30.669],[23.668,8.368],[5.637,-30.669]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[873.413,510.49]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-23.889],[0,0],[0,-6.194],[-9.069,-6.415],[0,0],[-9.291,3.539],[0,0],[0.442,4.424],[1.327,0.885],[0,0],[26.544,10.175],[0,0],[17.696,17.696],[18.58,-4.866],[0,0],[4.494,-21.791],[0,0],[0,0]],"o":[[0,0],[0,0],[0,6.194],[0,0],[0,0],[9.29,-3.539],[0,0],[-0.442,-4.424],[-1.327,-0.884],[0,0],[-16.147,-7.121],[0,0],[-17.696,-17.696],[-18.581,4.867],[0,0],[-4.494,21.791],[0,0],[0,0]],"v":[[-132.055,21.235],[-149.308,27.429],[-155.944,38.046],[-145.106,53.751],[-50.212,100.866],[-32.958,99.539],[151.52,30.083],[155.502,19.908],[150.193,9.29],[127.189,-0.442],[106.396,-34.507],[83.163,-43.653],[69.235,-83.613],[13.051,-98.212],[-63.484,-70.783],[-92.064,-38.664],[-94.963,-18.467],[-118.341,-10.175]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[925.616,529.033]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0.205,-0.719],[6.972,-12.532],[1.409,-0.652],[12.518,-4.674],[14.678,-4.721],[7.937,-3.109],[6.008,-3.367],[-1.058,10.694],[0,1.086],[0,0],[-1.071,2.068],[-4.972,1.578],[-5.873,2.236],[-17.537,6.674],[-10.891,4.659],[-9.839,1.97],[-2.72,-0.142],[-0.908,-1.043],[-0.64,-3.923],[0,-1.229],[0,0]],"o":[[-5.824,11.718],[-0.281,1.1],[-12.146,5.623],[-14.442,5.394],[-7.146,2.298],[-6.327,2.694],[-8.814,4.938],[-0.473,-0.72],[0,0],[0,-2.878],[3.522,-6.806],[5.996,-1.902],[17.53,-6.674],[11.637,-4.427],[4.004,-1.713],[2.397,-1.257],[1.509,0.079],[3.536,0.795],[0.59,0.76],[0,0],[0.072,0.615]],"v":[[133.166,36.389],[116.586,67.576],[113.183,71.41],[75.613,85.335],[31.962,100.904],[10.648,108.511],[-8.37,114.909],[-28.313,105.78],[-28.313,100.624],[-28.313,-48.77],[-26.956,-58.636],[-13.865,-66.824],[5.085,-73.772],[56.379,-93.436],[89.317,-106.317],[114.032,-114.819],[122.735,-117.831],[127.066,-116.643],[132.388,-108.518],[133.345,-105.537],[133.345,34.385]],"c":true}},"nm":"P"},{"ind":1,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[-11.281,-8.627],[0,0],[0,0],[-25.87,11.612],[0,0],[0,38.709],[0,0]],"o":[[0,0],[0,0],[0,0],[4.7,7.852],[0,0],[0,0],[68.939,-24.365],[0,0],[0,-34.507],[0,0]],"v":[[-14.599,-148.147],[-146.654,-121.603],[-146.654,68.184],[-132.055,100.037],[-117.01,111.318],[-66.449,138.087],[-18.58,136.535],[116.48,86.635],[145.991,37.001],[146.654,-143.502]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.004,0.502,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[927.164,704.387]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-7.806],[10.079,0],[0,6.506],[-10.078,0]],"o":[[0,6.505],[-10.078,0],[0,-6.505],[10.079,0]],"v":[[18.816,1.184],[0.567,12.964],[-18.815,0.051],[0.567,-12.964]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1029.455,812.364]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[7.9,2.803],[13.437,-4.051],[0,-0.124],[-14.455,0],[0,8.85]],"o":[[-13.097,5.033],[-0.004,0.124],[0,8.85],[14.455,0],[0,-5.83]],"v":[[13.25,-14.174],[-26.656,-0.81],[-26.671,-0.438],[-0.498,14.174],[26.67,-0.438]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1030.559,796.665]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-7.327],[10.262,0],[0,7.327],[-10.261,0]],"o":[[0,7.327],[-10.261,0],[0,-7.327],[10.262,0]],"v":[[18.581,0],[-0.001,13.266],[-18.581,0],[-0.001,-13.266]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[886.685,864.153]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-8.85],[14.763,0],[0,8.85],[-14.764,0]],"o":[[0,8.85],[-14.764,0],[0,-8.85],[14.763,0]],"v":[[26.733,0],[0,16.023],[-26.732,0],[0,-16.023]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[886.496,846.991]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[29.862,0.995],[0.664,-17.585],[0,0],[0,0],[-16.59,0.664],[1.991,5.309]],"o":[[0,0],[1.041,5.758],[0,0],[0,0],[16.59,-0.663],[0,0]],"v":[[-1.659,-17.997],[-28.203,-5.64],[-18.912,4.977],[-20.24,11.281],[-0.332,22.562],[15.788,5.115]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[814.354,822.01]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0},{"ind":53,"ty":4,"nm":"d","parent":15,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-51,-81,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-7.14,2.542],[0,0]],"o":[[0,0],[0,7.579],[0,0],[0,0]],"v":[[-37.335,-28.415],[-37.335,15.542],[-22.69,25.873],[37.336,4.502]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[936.187,795.678]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.291,2.367],[0,0],[0,1.835],[0,0],[7.173,-2.712],[0,0],[0,-4.56],[0,0]],"o":[[0,0],[2.54,-0.905],[0,0],[0.879,-1.611],[0,0],[0,-7.67],[0,0],[-4.266,1.613],[0,0],[0,0]],"v":[[-6.066,107.801],[58.212,84.916],[64.161,79.836],[79.398,51.901],[80.737,46.65],[80.737,-94.83],[65.893,-105.089],[-73.649,-52.33],[-80.737,-42.073],[-80.737,74.884]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[979.588,692.379]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-0.019,0.073],[-0.132,0.464],[-0.341,0.659],[0,0],[-0.001,0.051],[0,0],[0,0],[4.031,1.872],[2.844,-1.312],[0,0],[0,-9.732],[0,0],[-15.484,3.982],[0,0],[0,0],[0,0]],"o":[[0.125,-0.469],[-0.004,-0.763],[0,0],[0,-0.051],[0,0],[0,0],[-0.583,-4.194],[-2.256,-0.975],[0,0],[0,0],[0,0],[0,0],[15.484,-3.982],[0,0],[0,0],[0.016,-0.073]],"v":[[79.701,38.074],[80.127,36.688],[80.672,34.544],[80.672,31.077],[80.679,30.927],[80.353,28.306],[80.353,-108.836],[73.717,-118.128],[66.196,-118.128],[-74.043,-65.482],[-80.679,-53.095],[-80.679,105.724],[-64.311,115.458],[61.329,69.891],[66.637,62.37],[79.663,38.292]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.02,0.482,0.843,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[979.973,705.556]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":38,"st":0},{"ind":54,"ty":1,"nm":"R","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.882},"o":{"x":0.167,"y":0.118},"t":34,"s":[1007,599,0],"to":[2.833,-2.833,0],"ti":[-2.833,2.833,0]},{"t":36,"s":[1024,582,0]}],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0,0]},"t":34,"s":[4,4,100]},{"t":36,"s":[3,4,100]}],"l":2}},"ao":0,"sw":1920,"sh":1080,"sc":"#057bd7","ip":34,"op":37,"st":0},{"ind":55,"ty":4,"nm":"d","parent":16,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[93,-122,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-4.938,-2.968]],"o":[[4.937,1.179],[0,0]],"v":[[-7.406,-3.111],[7.406,3.11]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[954.811,579.157]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-0.306,-4.202]],"o":[[3.191,1.669],[0,0]],"v":[[-2.577,-4.444],[2.578,4.444]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[964.794,586.712]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-5.419,-0.571]],"o":[[4.978,-4.775],[0,0]],"v":[[-7.851,2.803],[7.85,-2.233]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[939.553,578.28]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[22.219,-17.923],[-22.219,17.923]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[909.484,599.006]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-8.344,6.795]],"o":[[-0.247,-8.617],[0,0]],"v":[[-5.95,11.56],[6.196,-11.56]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[881.068,628.489]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[3.354,-48.906]],"o":[[5.48,44.39],[0,0]],"v":[[-2.802,-70.211],[-0.552,70.211]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[970.174,661.367]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[6.791,-8.893]],"o":[[-1.327,20.088],[0,0]],"v":[[5.925,-22.07],[-5.925,22.07]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[963.698,753.649]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-20.127,19.405],[20.126,-19.404]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[937.646,795.124]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-1.69,-1.495]],"o":[[-0.018,7.359],[0,0]],"v":[[-1.324,-6.37],[1.342,6.37]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[876.443,803.123]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[6.256,2.79]],"o":[[-6.586,9.505],[0,0]],"v":[[10.387,-4.753],[-10.387,0.284]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[907.133,819.281]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-7.604,-2.352]],"o":[[4.46,4.816],[0,0]],"v":[[-9.48,-5.036],[9.48,5.037]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[887.265,814.529]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[875.119,796.754],[875.119,640.049]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0.008,0.936],[0.082,1.93],[0.147,5.634],[0.279,7.708],[0.103,3.719],[0.874,2.442],[0.01,0.51],[0.01,0.2],[2.212,8.594],[3.946,1.823],[5.648,-0.728],[4.04,-3.064],[2.682,-1.719],[0.081,-0.07],[9.164,-7.212],[3.172,-3.404],[1.409,-2.826],[0.657,-3.44],[0,-0.183],[0,0],[0,-0.368],[0,0],[0.01,-0.14],[0.028,-0.407],[-3.108,-3.699],[-4.435,-1.61],[-6.78,9.474],[-0.208,0.21],[-0.27,0.261],[-13.73,13.033],[-0.065,0.12],[-1.664,3.82],[-0.156,0.359],[-0.835,4.822],[-0.428,6.69],[-0.411,13.032],[-0.499,1.172],[-0.141,0.238],[0.03,0.173]],"o":[[-0.017,-1.932],[-0.238,-5.63],[-0.201,-7.71],[-0.135,-3.72],[-0.072,-2.556],[-0.207,-0.577],[-0.029,-0.187],[-0.48,-9.058],[-2.056,-3.194],[-5.079,-2.347],[-5.184,0.667],[-2.538,1.924],[-0.074,0.07],[-8.83,7.624],[-3.276,2.579],[-1.824,2.504],[-1.624,3.257],[0.016,0.172],[0,0],[0.061,0.326],[0,0],[0,0.147],[0.055,0.355],[-0.316,4.646],[3.29,3.916],[8.754,3.177],[0.185,-0.258],[0.193,-0.275],[13.595,-13.147],[0.055,-0.119],[2.115,-3.607],[0.076,-0.351],[1.965,-4.518],[1.143,-6.61],[0.832,-13.013],[-0.421,-1.088],[0.015,-0.109],[-0.002,-0.132],[-0.158,-0.914]],"v":[[48.806,-20.064],[48.625,-25.856],[48.294,-42.76],[47.604,-65.892],[47.025,-77.048],[46.615,-84.741],[46.299,-86.373],[46.24,-86.953],[43.305,-113.537],[34.721,-120.809],[18.245,-124.325],[4.802,-116.932],[-2.573,-110.676],[-2.795,-110.465],[-30.872,-88.243],[-41.328,-78.828],[-45.881,-71.937],[-48.539,-61.287],[-48.495,-60.769],[-48.495,18.9],[-48.396,19.939],[-48.396,94.665],[-48.417,95.091],[-48.373,96.234],[-45.707,109.066],[-32.979,116.835],[-6.425,115.579],[-5.832,114.884],[-5.154,114.077],[35.487,74.453],[35.645,74.097],[40.987,62.807],[41.333,61.741],[44.788,46.429],[46.927,26.436],[48.581,-12.657],[48.596,-16.135],[48.815,-16.656],[48.773,-17.108]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.02,0.482,0.843,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[923.492,700.426]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":38,"st":0},{"ind":56,"ty":3,"nm":"a","sr":1,"ks":{"o":{"a":0,"k":0},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":42,"s":[600,540,0],"to":[60,0,0],"ti":[-60,0,0]},{"i":{"x":0.667,"y":0.887},"o":{"x":0.333,"y":0},"t":51,"s":[960,540,0],"to":[0,0,0],"ti":[-0.284,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0.313},"t":52,"s":[962.455,540,0],"to":[1.399,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":56,"s":[966,540,0],"to":[-3.6,0,0],"ti":[11.213,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":60,"s":[950.215,540,0],"to":[-3.129,0,0],"ti":[3.41,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":61,"s":[932.371,540,0],"to":[-1.308,0,0],"ti":[9.989,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":62,"s":[915.207,540,0],"to":[-8.694,0,0],"ti":[0.483,0,0]},{"t":63,"s":[893,540,0]}],"l":2},"a":{"a":0,"k":[0,0,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"ip":0,"op":64,"st":0},{"ind":57,"ty":4,"nm":"S","td":1,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[960,540,0],"l":2},"a":{"a":0,"k":[0,0,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[432,384]},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"nm":"R"},{"ty":"st","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":1,"lj":1,"ml":4,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[1,0,0,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[146,137]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"R"}],"ip":0,"op":64,"st":0},{"ind":58,"ty":4,"nm":"B","parent":56,"tt":1,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[43.53,573.11,0],"l":2},"a":{"a":0,"k":[965.53,543.11,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-11.035,-0.167],[-3.344,-4.013],[12.205,-0.335],[0,0]],"o":[[0,0],[11.546,0.175],[4.774,5.728],[-12.205,0.334],[0,0]],"v":[[-22.922,-8.611],[-2.585,-2.424],[18.147,-4.43],[1.762,8.277],[-18.301,5.602]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":1,"ml":10,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.322,0.812,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1186.095,134.345]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-11.035,-0.167],[-3.344,-4.013],[12.206,-0.335],[0,0]],"o":[[0,0],[11.546,0.175],[4.774,5.728],[-12.205,0.334],[0,0]],"v":[[-20.216,-6.99],[-4.895,-2.508],[15.837,-4.514],[-0.548,8.193],[-20.611,5.517]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":1,"ml":10,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.322,0.812,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1188.405,143.091]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-5.121,-0.078],[-3.344,-4.013],[12.205,-0.334],[0,0]],"o":[[3.555,1.527],[11.546,0.175],[4.773,5.728],[-12.206,0.335],[0,0]],"v":[[-19.547,-6.122],[-4.895,-2.508],[15.838,-4.514],[-0.547,8.192],[-20.611,5.517]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":1,"ml":10,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.322,0.812,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1188.405,151.753]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-5.828,-0.088],[-3.344,-4.013],[12.205,-0.335],[0,0]],"o":[[3.674,1.736],[11.546,0.175],[4.773,5.728],[-12.205,0.334],[0,0]],"v":[[-18.713,-6.201],[-5.342,-2.508],[15.39,-4.514],[-0.995,8.193],[-20.162,5.949]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":1,"ml":10,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.322,0.812,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1188.853,160.415]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":1228,"st":0},{"ind":59,"ty":4,"nm":"S","td":1,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[960,540,0],"l":2},"a":{"a":0,"k":[0,0,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[432,384]},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"nm":"R"},{"ty":"st","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":1,"lj":1,"ml":4,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[1,0,0,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[146,137]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"R"}],"ip":0,"op":64,"st":0},{"ind":60,"ty":4,"nm":"B","parent":56,"tt":1,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[43.53,573.11,0],"l":2},"a":{"a":0,"k":[965.53,543.11,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[-4.179,3.345],[-0.668,2.677],[4.178,4.68],[-1.146,1.478],[-5.684,-5.353],[-0.165,-3.174],[0.336,-1.672],[0,0],[-4.415,-2.212],[-1.507,-2.671],[0,0],[15.415,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[5.452,-4.363],[0.346,-1.388],[-3.245,-3.638],[1.17,-1.506],[3.729,3.506],[0.166,3.179],[-0.332,1.673],[0,0],[4.686,2.34],[1.771,3.146],[0,0],[-20.509,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[130.488,25.468],[-230.581,25.468],[-230.581,1.559],[129.819,1.559],[143.026,1.559],[147.375,1.559],[163.089,1.559],[167.939,1.559],[176.13,1.559],[180.811,1.559],[185.828,1.559],[191.346,-6.968],[203.384,-13.486],[200.375,-23.851],[199.37,-31.042],[210.906,-29.536],[215.756,-19.005],[214.918,-12.482],[213.417,-10.141],[220.603,-7.967],[228.297,0.891],[230.582,32.437],[212.302,34.889],[186.442,25.468],[180.811,25.468],[172.117,25.468],[163.089,25.468],[147.375,25.468],[143.026,25.468]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0,0.129,0.251,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":1,"ml":10,"nm":"S"},{"ty":"fl","c":{"a":0,"k":[0.322,0.812,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[940.896,132.7]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[-15.848,-0.223],[0,0],[1.772,3.145],[4.685,2.341],[0,0],[-0.331,1.672],[0.166,3.178],[3.728,3.505],[1.17,-1.507],[-3.245,-3.639],[0.346,-1.388],[5.453,-4.363],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[2.612,4.399],[13.259,-1.376],[0,0],[-1.506,-2.672],[-4.415,-2.212],[0,0],[0.337,-1.672],[-0.166,-3.174],[-5.685,-5.353],[-1.146,1.477],[4.178,4.68],[-0.668,2.676],[-4.178,3.344],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-105.281,25.025],[-105.281,25.357],[61.655,25.357],[88.852,35],[105.19,33.233],[103.509,0.78],[95.816,-8.079],[88.63,-10.253],[90.131,-12.593],[90.97,-19.116],[86.119,-29.647],[74.584,-31.153],[75.588,-23.962],[78.596,-13.597],[66.559,-7.079],[61.04,1.448],[56.024,1.448],[-105.281,1.95],[-105.281,6.801],[-105.281,16.83]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.322,0.812,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1065.683,132.812]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":1228,"st":0},{"ind":61,"ty":4,"nm":"d","parent":17,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-50,-79,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[6.975,2.542],[0,0]],"o":[[0,0],[0,7.579],[0,0],[0,0]],"v":[[36.476,-28.415],[36.476,15.542],[22.169,25.873],[-36.477,4.502]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1181.357,795.678]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[1.261,2.367],[0,0],[0,1.835],[0,0],[-7.008,-2.712],[0,0],[0,-4.56],[0,0]],"o":[[0,0],[-2.482,-0.905],[0,0],[-0.859,-1.611],[0,0],[0,-7.67],[0,0],[4.167,1.613],[0,0],[0,0]],"v":[[5.927,107.801],[-56.873,84.916],[-62.685,79.836],[-77.571,51.901],[-78.88,46.65],[-78.88,-94.83],[-64.377,-105.089],[71.954,-52.33],[78.88,-42.073],[78.88,74.884]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1138.954,692.379]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-9.733],[0,0],[15.128,3.981],[0,0],[0,0],[0,0],[0,0],[0,0],[-3.939,1.871],[-2.779,-1.312]],"o":[[0,0],[0,0],[0,0],[-15.127,-3.982],[0,0],[0,0],[0,0],[0,0],[0.569,-4.194],[2.204,-0.976],[0,0]],"v":[[72.613,-65.482],[79.095,-53.095],[79.095,105.725],[63.104,115.458],[-59.646,69.891],[-64.832,62.37],[-79.095,35.384],[-78.23,28.306],[-78.23,-108.837],[-71.748,-118.127],[-64.4,-118.127]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.02,0.482,0.843,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1138.305,705.556]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":38,"op":64,"st":0},{"ind":62,"ty":4,"nm":"d","parent":18,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-126,-119,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-6.669,4.373]],"o":[[-6.669,4.372],[0,0]],"v":[[-72.026,-117.132],[78.696,112.758]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1135.266,706.895]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[4.327,-4.699],[0,0]],"o":[[0,0],[0,7.579],[0,0],[0,0]],"v":[[10.983,-32.695],[10.983,-1.622],[7.562,15.365],[-11.889,32.695]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1225.851,786.958]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-12.298,-4.493],[-23.143,-9.041],[-22.805,-9.215],[0,-5],[0.172,-39.102]],"o":[[27.744,-16.857],[6.487,2.481],[21.744,8.04],[4,2],[0,39],[0,0]],"v":[[-86.882,-73.822],[-48.024,-85.594],[13.882,-61.423],[78.882,-37.423],[86.882,-26.423],[86.71,90.678]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1150.122,663.585]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-9.733],[0,0],[11.475,-10.224],[0,0],[0,0],[0,0],[0,0],[0,0],[-3.939,1.872],[-2.778,-1.312]],"o":[[0,0],[0,9.733],[-1.866,2.288],[-1.674,0.062],[0,0],[0,0],[0,0],[0,0],[9.127,-5.528],[2.204,-0.975],[0,0]],"v":[[80.353,-70.308],[86.836,-57.921],[86.836,100.899],[63.886,122.505],[57.327,116.613],[33.941,85.318],[-37.671,-21.888],[-85.506,-101.703],[-86.836,-107.385],[-65.404,-119.789],[-54.012,-121.255]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.02,0.482,0.843,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1150.076,697.148]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":38,"op":64,"st":0},{"ind":63,"ty":4,"nm":"b","parent":19,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[123,-278,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-19.518,6.981]],"o":[[19.975,-7.545],[0,0]],"v":[[-30.247,10.763],[30.246,-10.763]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[930.276,796.943]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-22,8],[-7,12],[-0.32,47.452]],"o":[[21.483,-8.019],[9,-10],[0,-47],[0,0]],"v":[[-43.401,99.735],[22.082,76.716],[43.082,41.716],[43.401,-99.736]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1003.924,686.444]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-7.14,2.542],[0,0]],"o":[[0,0],[0,7.579],[0,0],[0,0]],"v":[[-37.335,-28.415],[-37.335,15.542],[-22.69,25.873],[37.336,4.502]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[936.187,795.678]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.291,2.367],[0,0],[0,1.835],[0,0],[7.173,-2.712],[0,0],[0,-4.56],[0,0]],"o":[[0,0],[2.54,-0.905],[0,0],[0.879,-1.611],[0,0],[0,-7.67],[0,0],[-4.266,1.613],[0,0],[0,0]],"v":[[-6.066,107.801],[58.212,84.916],[64.161,79.836],[79.398,51.901],[80.737,46.65],[80.737,-94.83],[65.893,-105.089],[-73.649,-52.33],[-80.737,-42.073],[-80.737,74.884]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[979.588,692.379]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-0.591,1.697],[-0.105,1.416],[-0.23,0.568],[0,0],[5.556,-0.154],[0,0],[0.645,-1.456],[7.506,-10.569],[0.734,-0.251],[0.643,-0.138],[4.886,-1.77],[7.05,-2.138],[14.569,-5.251],[0,0],[-0.059,-0.154],[-1.434,-3.399],[-0.458,-0.463],[-3.041,0.294],[-0.982,0.273],[-9.367,2.812],[-11.546,4.084],[-11.368,4.678],[-4.957,1.419],[-3.277,2.289],[-3.358,6.006],[-1.936,3.082]],"o":[[0.459,-1.318],[0.047,-0.639],[0,0],[-2.987,-4.684],[0,0],[0.588,0.987],[-5.307,11.976],[-0.606,0.853],[-0.462,0.291],[-5.093,1.096],[-6.928,2.511],[-14.824,4.497],[-10.106,3.643],[0,0],[0.151,2.829],[0.4,0.467],[2.125,1.496],[0.69,-0.519],[16.286,-4.514],[11.729,-3.52],[11.582,-4.096],[4.765,-1.961],[3.784,-1.082],[3.031,-4.704],[2.017,-3.608],[0.531,-1.722]],"v":[[80.298,37.236],[80.711,33.24],[81.139,31.421],[81.139,-110.782],[67.098,-118.313],[67.098,19.669],[67.167,23.374],[47.788,57.057],[45.745,58.676],[44.095,59.334],[29.153,64.741],[9.339,71.601],[-32.732,86.728],[-65.979,97.923],[-81.08,103.647],[-78.852,114.573],[-74.963,116.971],[-69.581,117.693],[-67.032,116.68],[-32.36,105.561],[2.167,93.004],[36.746,80.469],[51.195,75.15],[61.998,70.444],[72.826,51.662],[78.608,41.529]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.02,0.482,0.843,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[979.716,704.434]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[-22,8],[-7,12],[-0.32,47.452]],"o":[[21.483,-8.019],[9,-10],[0,-47],[0,0]],"v":[[-43.401,99.735],[22.082,76.716],[43.082,41.716],[43.401,-99.736]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1003.924,686.444]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[-4.948,0],[0,5.222],[4.947,0]],"o":[[0,5.222],[4.947,0],[0,-5.223],[-4.948,0]],"v":[[-8.958,0],[0,9.456],[8.958,0],[0,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1024.823,530.913]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[-4.947,0],[0,5.222],[4.948,0]],"o":[[0,5.222],[4.948,0],[0,-5.223],[-4.947,0]],"v":[[-8.958,0],[-0.001,9.456],[8.958,0],[-0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[994.409,543.632]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[-4.947,0],[0,5.223],[4.948,0]],"o":[[0,5.223],[4.948,0],[0,-5.223],[-4.947,0]],"v":[[-8.958,0],[-0.001,9.456],[8.958,0],[-0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[959.459,556.904]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[-4.947,0],[0,5.223],[4.948,0]],"o":[[0,5.223],[4.948,0],[0,-5.223],[-4.947,0]],"v":[[-8.958,0],[-0.001,9.456],[8.958,0],[-0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[922.63,571.061]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[4.947,0],[0,5.223],[-4.948,0]],"o":[[0,5.223],[-4.948,0],[0,-5.223],[4.947,0]],"v":[[8.958,0],[0,9.456],[-8.959,0],[0,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[883.81,581.236]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[4.947,0],[0,5.223],[-4.948,0]],"o":[[0,5.223],[-4.948,0],[0,-5.223],[4.947,0]],"v":[[8.959,0],[0.001,9.456],[-8.958,0],[0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[847.091,567.964]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-5.223],[4.947,0],[0,5.222],[-4.948,0]],"o":[[0,5.222],[-4.948,0],[0,-5.223],[4.947,0]],"v":[[8.959,0],[0.001,9.456],[-8.958,0],[0.001,-9.456]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[817.008,549.826]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[24.097,8.032],[-24.098,-8.032]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[874.007,510.924]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[6.025,-30.925],[-6.024,-0.402],[-2.812,30.925]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[872.802,510.522]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[4.82,-30.925],[24.098,8.434],[-4.016,30.925],[-24.097,-7.631]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[874.007,510.522]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-24.097,8.032],[24.097,-8.032]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[949.936,491.557]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-6.024,-30.925],[6.024,-0.402],[2.812,30.925]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[951.141,491.155]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-4.819,-30.925],[-24.097,8.434],[4.017,30.925],[24.098,-7.631]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[949.936,491.155]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-7.14,2.542],[0,0]],"o":[[0,0],[0,7.579],[0,0],[0,0]],"v":[[-37.335,-28.415],[-37.335,15.542],[-22.69,25.873],[37.336,4.502]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[936.187,795.678]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-1.291,2.367],[0,0],[0,1.835],[0,0],[7.173,-2.712],[0,0],[0,-4.56],[0,0]],"o":[[0,0],[2.54,-0.905],[0,0],[0.879,-1.611],[0,0],[0,-7.67],[0,0],[-4.266,1.613],[0,0],[0,0]],"v":[[-6.066,107.801],[58.212,84.916],[64.161,79.836],[79.398,51.901],[80.737,46.65],[80.737,-94.83],[65.893,-105.089],[-73.649,-52.33],[-80.737,-42.073],[-80.737,74.884]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[979.588,692.379]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[2.511,1.186],[0,0],[0.014,-5.253],[0,0],[-0.697,-1.119],[0,0],[-1.35,-0.593],[0,0],[0.024,5.187],[0,0]],"o":[[0,0],[-0.013,-2.719],[0,0],[-4.851,-2.292],[0,0],[-0.004,1.31],[0,0],[0.768,1.233],[0,0],[4.855,2.13],[0,0],[0,0]],"v":[[36.582,69.522],[36.067,-71.032],[31.943,-77.414],[-25.981,-104.779],[-36.488,-98.383],[-36.892,56.11],[-35.832,59.825],[-21.818,82.338],[-18.567,85.141],[26.552,104.94],[36.872,98.409],[36.734,69.522]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[831.343,714.552]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[6.464,0],[0,8.344],[-4.924,2.734]],"o":[[-4.668,2.091],[-15.026,0],[0,-4.172],[0,0]],"v":[[22.139,9.552],[5.069,12.895],[-22.138,-2.213],[-14.169,-12.895]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[808.179,817.41]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-1.373],[10.261,0],[0,7.513],[-0.705,1.437]],"o":[[0.516,1.249],[0,7.513],[-10.262,0],[0,-1.614],[0,0]],"v":[[17.786,-8.448],[18.58,-4.501],[0,9.102],[-18.581,-4.501],[-17.492,-9.102]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[812.805,836.023]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-3.305],[15.026,0],[4.978,3.561]],"o":[[3.243,2.487],[0,8.344],[-8.748,0],[0,0]],"v":[[19.204,-11.979],[24.358,-3.129],[-2.849,11.979],[-24.358,6.125]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1032.871,798.861]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-1.373],[10.261,0],[0,7.513],[-0.705,1.437]],"o":[[0.516,1.249],[0,7.513],[-10.262,0],[0,-1.614],[0,0]],"v":[[17.786,-8.448],[18.58,-4.501],[0,9.102],[-18.581,-4.501],[-17.492,-9.102]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1029.579,816.557]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-1.373],[10.262,0],[0,7.513],[-0.704,1.437]],"o":[[1.025,0.937],[0,7.513],[-10.262,0],[0,-1.615],[0,0]],"v":[[17.133,-9.102],[18.581,-4.501],[-0.001,9.102],[-18.581,-4.501],[-17.492,-9.101]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[886.686,868.317]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-2.311],[14.843,0],[0,8.613],[-1.156,1.076]],"o":[[1.554,1.973],[0,8.613],[-14.843,0],[0,-1.077],[0,0]],"v":[[24.455,-11.036],[26.875,-4.558],[0,11.036],[-26.875,-4.558],[-25.166,-9.239]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[886.64,851.548]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[883.81,845.788],[883.81,778.765]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[883.81,778.765],[883.81,630.937]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-41.838,-20.679],[0,0],[-13.667,5.067],[0,0],[45.715,17.404],[6.243,0.052]],"o":[[0,0],[-43.889,15.871],[0,0],[13.068,6.458],[0,0],[45.865,-17.004],[-5.927,-2.256],[0,0]],"v":[[-48.32,-39.792],[-53.245,-38.011],[-58.703,59.297],[-57.951,59.669],[-16.064,61.849],[54.392,35.727],[54.825,-63.452],[36.421,-66.916]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.482,494.565]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[5.964,-2.156],[0,0]],"o":[[-6.243,-0.052],[0,0],[0,0]],"v":[[42.371,-13.536],[23.911,-10.381],[-42.37,13.588]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[913.533,441.185]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-22.66,-11.2],[0,0],[-7.403,2.745],[0,0],[24.759,9.426],[0,0]],"o":[[0,0],[-23.77,8.596],[0,0],[7.078,3.498],[0,0],[24.84,-9.21],[0,0],[0,0]],"v":[[-92.612,-34.094],[-110.589,-27.593],[-113.545,25.109],[-52.348,55.356],[-29.661,56.536],[111.212,4.308],[111.446,-49.407],[85.514,-59.28]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[923.265,544.66]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-10.475,-5.177],[0,0],[-3.422,1.268],[0,0],[11.446,4.357],[0,0]],"o":[[0,0],[-10.989,3.973],[0,0],[3.272,1.617],[0,0],[11.483,-4.258],[0,0],[0,0]],"v":[[-130.762,-30.138],[-147.021,-24.258],[-148.388,0.104],[-48.788,49.332],[-38.301,49.878],[147.31,-18.937],[147.418,-43.768],[128.039,-51.146]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[925.005,580.174]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[-17.728,-9.042],[0,0],[-13.831,5.068],[0,0],[0,22.215],[0,0]],"o":[[0,0],[0,19.9],[0,0],[13.122,6.693],[0,0],[20.858,-7.643],[0,0],[0,0]],"v":[[-146.322,-121.324],[-146.322,63.906],[-117.435,111.068],[-68.026,136.271],[-25.755,138.818],[111.596,88.488],[146.322,38.778],[146.322,-143.886]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[926.833,704.772]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[4.866,2.654],[0,0],[0.884,-7.078],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[-4.866,-2.655],[0,0],[-0.885,7.078],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[36.055,-65.032],[31.631,-76.534],[-27.65,-104.849],[-36.055,-98.654],[-36.498,57.511],[-21.456,84.497],[-11.281,89.806],[25.88,105.29],[33.843,105.733],[36.94,100.423]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.02,0.482,0.843,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[831.386,713.955]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-5.428,-31.084],[-23.566,8.079],[4.305,31.084],[23.566,-7.609]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[950.288,491.314]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-23.668,-6.194],[-4.203,29.641],[23.668,8.406],[4.645,-29.641]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[873.413,510.452]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-3.597,-22.99],[0,0],[0,-6.193],[-8.721,-4.298],[0,0],[-9.291,3.539],[0,0],[0.442,4.424],[1.327,0.885],[0,0],[26.544,10.175],[0,0],[16.466,16.466],[18.58,-4.866],[0,0],[4.494,-21.791],[0,0],[0,0]],"o":[[0,0],[0,0],[0,6.194],[0,0],[0,0],[9.29,-3.54],[0,0],[-0.442,-4.423],[-1.327,-0.885],[0,0],[-15.484,-7.963],[0,0],[-17.696,-17.696],[-18.581,4.866],[0,0],[-3.535,18.475],[0,0],[0,0]],"v":[[-131.159,21.003],[-149.094,27.428],[-156.159,38.952],[-144.892,53.023],[-49.998,100.866],[-32.744,99.539],[151.734,30.083],[155.716,19.907],[150.407,9.29],[127.403,-0.443],[106.61,-34.507],[83.164,-43.654],[69.449,-83.613],[13.266,-98.212],[-63.27,-70.784],[-91.81,-38.299],[-93.611,-18.468],[-116.036,-10.882]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[925.402,529.033]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0.205,-0.719],[6.972,-12.532],[1.409,-0.652],[12.518,-4.674],[14.678,-4.72],[6.918,-2.946],[6.504,-2.265],[0.872,7.84],[0,1.586],[0,0],[0,0.419],[0,0],[-0.718,1.473],[-0.111,0.198],[-4.232,1.296],[-1.455,0.565],[-5.873,2.236],[-17.537,6.674],[-10.891,4.659],[-9.839,1.97],[-2.72,-0.142],[-0.908,-1.043],[-0.64,-3.923],[0,-1.229],[0,0]],"o":[[-5.824,11.718],[-0.281,1.1],[-12.146,5.623],[-14.442,5.394],[-7.146,2.299],[-6.327,2.695],[-7.126,2.482],[-0.916,-0.805],[0,0],[-0.079,-0.364],[0,0],[-0.492,-1.211],[0.101,-0.206],[0.573,-4.286],[1.513,-0.697],[5.864,-2.276],[17.53,-6.674],[11.637,-4.427],[4.004,-1.713],[2.397,-1.257],[1.509,0.079],[3.536,0.796],[0.59,0.76],[0,0],[0.072,0.615]],"v":[[133.166,36.389],[116.586,67.576],[113.183,71.41],[75.613,84.364],[31.962,99.644],[10.648,106.859],[-8.37,114.909],[-26.604,108.326],[-28.129,104.741],[-28.129,0.271],[-28.252,-0.902],[-28.252,-52.668],[-28.065,-56.774],[-27.738,-57.372],[-18.365,-64.953],[-13.865,-66.824],[3.102,-73.657],[56.379,-93.436],[89.317,-106.318],[114.032,-114.819],[121.941,-117.038],[125.694,-115.271],[132.388,-108.518],[133.345,-105.537],[133.345,34.385]],"c":true}},"nm":"P"},{"ind":1,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[-11.281,-8.627],[0,0],[0,0],[-25.87,11.613],[0,0],[0,38.709],[0,0]],"o":[[0,0],[0,0],[0,0],[4.7,7.852],[0,0],[0,0],[68.939,-24.365],[0,0],[0,-34.507],[0,0]],"v":[[-14.599,-148.147],[-146.654,-121.604],[-146.654,68.184],[-132.055,100.036],[-117.01,111.318],[-66.449,138.087],[-18.58,136.535],[116.48,86.635],[145.991,37.001],[146.654,-143.502]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.004,0.502,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[927.164,704.388]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-7.806],[10.079,0],[0,6.506],[-10.078,0]],"o":[[0,6.505],[-10.078,0],[0,-6.505],[10.079,0]],"v":[[18.816,1.184],[0.567,12.964],[-18.815,0.051],[0.567,-12.964]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1029.455,812.364]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-8.85],[14.455,0],[0,8.85],[-14.454,0]],"o":[[0,8.85],[-14.454,0],[0,-8.85],[14.455,0]],"v":[[26.67,0.706],[-0.498,15.318],[-26.67,0.706],[-0.498,-15.318]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1030.559,795.521]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-7.327],[10.262,0],[0,7.327],[-10.261,0]],"o":[[0,7.327],[-10.261,0],[0,-7.327],[10.262,0]],"v":[[18.581,0],[-0.001,13.266],[-18.581,0],[-0.001,-13.266]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[886.685,864.153]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-8.85],[14.763,0],[0,8.85],[-14.764,0]],"o":[[0,8.85],[-14.764,0],[0,-8.85],[14.763,0]],"v":[[26.733,0],[0,16.023],[-26.732,0],[0,-16.023]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[886.496,846.991]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[29.862,0.995],[0.664,-17.585],[0,0],[0,0],[-16.59,0.664],[1.991,5.309]],"o":[[0,0],[1.041,5.758],[0,0],[0,0],[16.59,-0.663],[0,0]],"v":[[-1.659,-17.997],[-28.203,-5.64],[-18.912,4.977],[-20.24,11.281],[-0.332,22.562],[15.788,5.115]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[814.354,822.01]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0},{"ind":64,"ty":4,"nm":"c","parent":20,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[95,-200,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.805,766.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[948.066,766.516],[948.066,776.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[891.544,766.516],[891.544,776.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.242,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.805,779.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.805,766.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[919.805,771.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[910.805,778.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[939.066,778.516],[939.066,788.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[882.544,778.516],[882.544,788.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.242,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[910.805,791.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[910.805,778.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[910.805,783.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.805,791.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[948.066,791.516],[948.066,801.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[891.544,791.516],[891.544,801.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.242,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.805,804.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[919.805,791.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[919.805,796.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[911.805,804.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[940.066,804.516],[940.066,814.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[883.544,804.516],[883.544,814.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.242,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[911.805,817.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[911.805,804.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[911.805,809.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0},{"ind":65,"ty":4,"nm":"c","parent":21,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[40,-167,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[971.805,733.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1000.066,733.516],[1000.066,743.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[943.544,733.516],[943.544,743.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.242,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[971.805,746.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[971.805,733.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[971.805,738.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[962.805,745.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[991.066,745.516],[991.066,755.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[934.544,745.516],[934.544,755.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.242,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[962.805,758.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[962.805,745.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[962.805,750.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[971.805,758.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1000.066,758.516],[1000.066,768.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[943.544,758.516],[943.544,768.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.242,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[971.805,771.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[971.805,758.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[971.805,763.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[963.805,771.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[992.066,771.516],[992.066,781.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[935.544,771.516],[935.544,781.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.242,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[963.805,784.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[963.805,771.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[963.805,776.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0},{"ind":66,"ty":4,"nm":"c","parent":22,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-8,-171,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[-7.108,0],[0,1.682],[7.108,0]],"o":[[0,1.682],[7.108,0],[0,-1.682],[-7.108,0]],"v":[[-12.871,0],[0,3.046],[12.871,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1012.003,739.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[984.231,739.271],[984.231,749.271]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1039.776,739.271],[1039.776,749.271]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[15.338,0],[0,3.63],[-0.007,0.06]],"o":[[0.055,0.168],[0,3.63],[-15.338,0],[0,-0.06],[0,0]],"v":[[27.681,-3.542],[27.773,-3.031],[0,3.542],[-27.773,-3.031],[-27.754,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1012.003,752.302]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[-15.339,0],[0,3.63],[15.338,0]],"o":[[0,3.63],[15.338,0],[0,-3.63],[-15.339,0]],"v":[[-27.773,0],[0,6.572],[27.772,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1012.003,739.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[-0.417,-3.041],[-7.296,0],[-4.559,6.182],[0,2.251],[9.904,0]],"o":[[0,1.713],[4.422,4.02],[6.479,0],[0.052,-3.818],[0,-5.043],[-9.905,0]],"v":[[-27.772,-5],[-27.355,6.129],[-1.07,11.572],[27.72,5.39],[27.772,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1012.003,744.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[-7.108,0],[0,1.682],[7.108,0]],"o":[[0,1.682],[7.108,0],[0,-1.682],[-7.108,0]],"v":[[-12.871,0],[0,3.046],[12.871,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1020.848,751.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[993.075,751.271],[993.075,761.271]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1048.62,751.271],[1048.62,761.271]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[15.338,0],[0,3.63],[-0.006,0.06]],"o":[[0.055,0.168],[0,3.63],[-15.338,0],[0,-0.06],[0,0]],"v":[[27.681,-3.542],[27.773,-3.031],[0,3.542],[-27.773,-3.031],[-27.754,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1020.848,764.302]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[-15.339,0],[0,3.63],[15.338,0]],"o":[[0,3.63],[15.338,0],[0,-3.63],[-15.339,0]],"v":[[-27.772,0],[0,6.572],[27.772,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1020.848,751.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[-0.417,-3.041],[-7.296,0],[-4.559,6.182],[0,2.251],[9.904,0]],"o":[[0,1.713],[4.422,4.02],[6.479,0],[0.052,-3.818],[0,-5.043],[-9.905,0]],"v":[[-27.772,-5],[-27.355,6.129],[-1.07,11.572],[27.72,5.39],[27.772,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1020.848,756.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[-7.108,0],[0,1.682],[7.108,0]],"o":[[0,1.682],[7.108,0],[0,-1.682],[-7.108,0]],"v":[[-12.871,0],[0,3.046],[12.871,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1012.003,764.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[984.231,764.271],[984.231,774.271]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1039.776,764.271],[1039.776,774.271]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[15.338,0],[0,3.63],[-0.007,0.06]],"o":[[0.055,0.168],[0,3.63],[-15.338,0],[0,-0.06],[0,0]],"v":[[27.681,-3.542],[27.773,-3.031],[0,3.542],[-27.773,-3.031],[-27.754,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1012.003,777.302]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[-15.339,0],[0,3.63],[15.338,0]],"o":[[0,3.63],[15.338,0],[0,-3.63],[-15.339,0]],"v":[[-27.773,0],[0,6.572],[27.772,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1012.003,764.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[-0.417,-3.041],[-7.296,0],[-4.559,6.182],[0,2.251],[9.904,0]],"o":[[0,1.713],[4.422,4.02],[6.479,0],[0.052,-3.818],[0,-5.043],[-9.905,0]],"v":[[-27.772,-5],[-27.355,6.129],[-1.07,11.572],[27.72,5.39],[27.772,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1012.003,769.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[-7.108,0],[0,1.682],[7.108,0]],"o":[[0,1.682],[7.108,0],[0,-1.682],[-7.108,0]],"v":[[-12.871,0],[0,3.046],[12.871,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1019.865,777.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[992.092,777.271],[992.092,787.271]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1047.638,777.271],[1047.638,787.271]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[15.338,0],[0,3.63],[-0.007,0.06]],"o":[[0.055,0.168],[0,3.63],[-15.338,0],[0,-0.06],[0,0]],"v":[[27.681,-3.542],[27.773,-3.031],[0,3.542],[-27.773,-3.031],[-27.754,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1019.865,790.302]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[-15.339,0],[0,3.63],[15.338,0]],"o":[[0,3.63],[15.338,0],[0,-3.63],[-15.339,0]],"v":[[-27.772,0],[0,6.572],[27.772,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1019.865,777.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[-0.417,-3.041],[-7.296,0],[-4.559,6.182],[0,2.251],[9.904,0]],"o":[[0,1.713],[4.422,4.02],[6.479,0],[0.052,-3.818],[0,-5.043],[-9.905,0]],"v":[[-27.772,-5],[-27.355,6.129],[-1.07,11.572],[27.72,5.39],[27.772,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1019.865,782.271]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0},{"ind":67,"ty":4,"nm":"g","parent":23,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-6,-120,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-15.004,-14.219],[15.004,14.22]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1046.58,682.649]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[25.105,-6.669],[-25.105,6.669]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1006.471,675.098]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-6.997,19.024],[6.997,-19.025]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[974.369,700.792]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-30.827,-22.653],[30.828,22.653]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[998.199,742.469]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[16.279,-34.127],[-16.279,34.127]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1045.305,730.996]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-5.782,31.611],[5.782,-31.61]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1034.809,733.512]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6.865,28.39],[-6.865,-28.39]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1022.162,736.733]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-19.055,-25.521],[19.054,25.521]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1009.972,739.602]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-16.966,-13.288],[16.965,13.288]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[998.332,695.055]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[8.14,-19.957],[-8.14,19.956]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1023.436,688.386]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-47.107,11.473],[47.106,-11.474]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1014.478,708.343]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-4.898,-29.025],[-16.094,34.056],[16.094,-34.057],[5.045,-31.413]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1045.49,730.926]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-19.239,-22.581],[19.239,28.32],[5.141,-28.32],[-10.846,-24.625]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1010.156,736.662]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-23.143,20.026],[2.151,13.586],[23.144,8.552],[-6.751,-20.026]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1038.44,688.316]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-24.036,19.099],[-0.343,13.216],[24.036,7.478],[-9.895,-19.099]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[991.26,700.865]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[6.655,6.275],[2.997,2.884],[4.085,-1.028],[5.638,-1.449],[4.943,-1.792],[2.279,-0.386],[1.279,-3.395],[3.747,-9.154],[-4.642,-3.606],[-8.639,-5.896],[-7.678,-5.761],[-0.402,0.474],[-0.027,0.032],[-0.025,0.098],[-2.556,3.838],[-0.975,1.827],[-0.109,0.277],[-3.204,6.475],[-3.35,7.425],[-0.974,1.941]],"o":[[-3.667,-3.458],[-3.879,1.541],[-5.645,1.42],[-5.09,1.309],[-2.298,0.833],[-1.237,3.949],[-3.488,9.255],[4.793,3.363],[8.254,6.414],[7.927,5.409],[0.203,-0.504],[0.027,-0.032],[0.02,-0.096],[1.174,-4.461],[0.792,-1.977],[0.107,-0.279],[2.647,-6.729],[3.613,-7.304],[0.893,-1.98],[-6.967,-5.903]],"v":[[27.21,-38.784],[17.172,-48.346],[5.112,-45.241],[-11.803,-40.883],[-26.907,-36.448],[-33.713,-34.506],[-37.42,-23.24],[-47.292,3.328],[-33.803,13.096],[-8.78,31.964],[14.879,48.346],[15.777,46.872],[15.855,46.775],[15.902,46.49],[22.04,34.117],[24.631,28.414],[24.953,27.578],[34.223,8.013],[44.479,-14.135],[47.292,-20.01]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.004,0.502,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1014.516,716.636]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0},{"ind":68,"ty":4,"nm":"g","parent":24,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[78,-134,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-5.892,-19.814],[5.892,19.814]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[970.626,718.181]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[25.078,6.767],[-25.078,-6.768]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[939.656,691.599]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-15.567,12.983],[15.568,-12.983]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[899.01,697.815]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-15.384,-35.026],[15.385,35.026]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[898.827,745.824]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[31.153,-21.427],[-31.153,21.428]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[945.365,759.422]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-20.804,24.492],[20.803,-24.492]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[935.015,756.357]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-8.239,28.022],[8.239,-28.022]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[922.45,752.828]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.753,-31.627],[3.753,31.627]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[910.458,749.223]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-8.057,-19.987],[8.056,19.987]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[922.634,704.819]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[17.022,-13.219],[-17.022,13.22]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[947.712,711.586]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-46.537,-13.598],[46.537,13.598]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[929.98,724.397]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[10.259,-24.524],[-30.958,24.524],[30.958,-18.394],[20.065,-21.624]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[945.559,756.389]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-11.992,-31.659],[-4.096,31.659],[11.992,-24.447],[-3.702,-29.235]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[918.697,749.254]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-22.914,6.658],[2.215,13.717],[22.914,19.847],[11.298,-19.847]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[953.604,718.148]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-23.724,6.034],[-0.261,12.776],[23.724,19.987],[7.612,-19.987]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.459,0.855,0.875,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[906.965,704.819]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[2.629,8.761],[1.155,3.995],[4.052,1.151],[5.608,1.562],[5.176,0.918],[2.167,0.805],[2.805,-2.302],[7.821,-6.057],[-2.218,-5.443],[-4.538,-9.424],[-3.772,-8.827],[-0.585,0.211],[-0.039,0.015],[-0.071,0.072],[-4.131,2.048],[-1.757,1.095],[-0.233,0.185],[-6.01,4.007],[-6.612,4.759],[-1.813,1.194]],"o":[[-1.449,-4.828],[-4.13,-0.604],[-5.599,-1.59],[-5.063,-1.41],[-2.408,-0.427],[-3.044,2.803],[-7.645,6.274],[2.472,5.308],[3.945,9.68],[4.163,8.646],[0.428,-0.335],[0.04,-0.014],[0.066,-0.073],[3.246,-3.278],[1.674,-1.317],[0.232,-0.189],[5.655,-4.507],[6.78,-4.522],[1.763,-1.269],[-3.085,-8.595]],"v":[[38.781,-21.288],[34.864,-34.587],[22.866,-37.924],[6.036,-42.599],[-9.262,-46.305],[-16.129,-48.024],[-24.97,-40.116],[-46.796,-22.036],[-39.992,-6.835],[-27.743,22.012],[-15.436,48.025],[-13.922,47.196],[-13.805,47.15],[-13.622,46.927],[-2.124,39.276],[2.971,35.63],[3.668,35.068],[21.473,22.752],[41.424,8.691],[46.796,5.008]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.004,0.502,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[930.037,732.889]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0},{"ind":69,"ty":4,"nm":"c","parent":25,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[54,-87,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[-7.108,0],[0,1.682],[7.108,0]],"o":[[0,1.682],[7.108,0],[0,-1.682],[-7.108,0]],"v":[[-12.871,0],[0,3.046],[12.871,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[950.815,655.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[923.042,655.305],[923.042,665.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[978.588,655.305],[978.588,665.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[15.338,0],[0,3.63],[-0.006,0.06]],"o":[[0.055,0.168],[0,3.63],[-15.338,0],[0,-0.06],[0,0]],"v":[[27.681,-3.542],[27.773,-3.031],[0,3.542],[-27.773,-3.031],[-27.754,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[950.815,668.336]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[-15.339,0],[0,3.63],[15.338,0]],"o":[[0,3.63],[15.338,0],[0,-3.63],[-15.339,0]],"v":[[-27.773,0],[0,6.572],[27.772,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[950.815,655.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[-0.417,-3.041],[-7.296,0],[-4.559,6.182],[0,2.251],[9.904,0]],"o":[[0,1.713],[4.422,4.02],[6.479,0],[0.052,-3.818],[0,-5.043],[-9.905,0]],"v":[[-27.773,-5],[-27.356,6.129],[-1.07,11.572],[27.72,5.39],[27.772,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[950.815,660.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[-7.108,0],[0,1.682],[7.108,0]],"o":[[0,1.682],[7.108,0],[0,-1.682],[-7.108,0]],"v":[[-12.871,0],[0,3.046],[12.871,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[959.66,667.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[931.887,667.305],[931.887,677.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[987.432,667.305],[987.432,677.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[15.338,0],[0,3.63],[-0.007,0.06]],"o":[[0.055,0.168],[0,3.63],[-15.338,0],[0,-0.06],[0,0]],"v":[[27.681,-3.542],[27.773,-3.031],[0,3.542],[-27.773,-3.031],[-27.754,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[959.66,680.336]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[-15.339,0],[0,3.63],[15.338,0]],"o":[[0,3.63],[15.338,0],[0,-3.63],[-15.339,0]],"v":[[-27.773,0],[0,6.572],[27.772,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[959.66,667.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[-0.417,-3.041],[-7.296,0],[-4.559,6.182],[0,2.251],[9.904,0]],"o":[[0,1.713],[4.422,4.02],[6.479,0],[0.052,-3.818],[0,-5.043],[-9.905,0]],"v":[[-27.773,-5],[-27.356,6.129],[-1.07,11.572],[27.72,5.39],[27.772,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[959.66,672.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[-7.108,0],[0,1.682],[7.108,0]],"o":[[0,1.682],[7.108,0],[0,-1.682],[-7.108,0]],"v":[[-12.871,0],[0,3.046],[12.871,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[950.815,680.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[923.042,680.305],[923.042,690.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[978.588,680.305],[978.588,690.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[15.338,0],[0,3.63],[-0.006,0.06]],"o":[[0.055,0.168],[0,3.63],[-15.338,0],[0,-0.06],[0,0]],"v":[[27.681,-3.542],[27.773,-3.031],[0,3.542],[-27.773,-3.031],[-27.754,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[950.815,693.336]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[-15.339,0],[0,3.63],[15.338,0]],"o":[[0,3.63],[15.338,0],[0,-3.63],[-15.339,0]],"v":[[-27.773,0],[0,6.572],[27.772,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[950.815,680.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[-0.417,-3.041],[-7.296,0],[-4.559,6.182],[0,2.251],[9.904,0]],"o":[[0,1.713],[4.422,4.02],[6.479,0],[0.052,-3.818],[0,-5.043],[-9.905,0]],"v":[[-27.773,-5],[-27.356,6.129],[-1.07,11.572],[27.72,5.39],[27.772,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[950.815,685.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[-7.108,0],[0,1.682],[7.108,0]],"o":[[0,1.682],[7.108,0],[0,-1.682],[-7.108,0]],"v":[[-12.871,0],[0,3.046],[12.871,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[958.677,693.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[930.904,693.305],[930.904,703.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[986.45,693.305],[986.45,703.305]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[15.338,0],[0,3.63],[-0.007,0.06]],"o":[[0.055,0.168],[0,3.63],[-15.338,0],[0,-0.06],[0,0]],"v":[[27.681,-3.542],[27.773,-3.031],[0,3.542],[-27.773,-3.031],[-27.754,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[958.677,706.336]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[-15.339,0],[0,3.63],[15.338,0]],"o":[[0,3.63],[15.338,0],[0,-3.63],[-15.339,0]],"v":[[-27.772,0],[0,6.572],[27.773,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[958.677,693.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[-0.417,-3.041],[-7.296,0],[-4.559,6.182],[0,2.251],[9.904,0]],"o":[[0,1.713],[4.422,4.02],[6.479,0],[0.052,-3.818],[0,-5.043],[-9.905,0]],"v":[[-27.772,-5],[-27.355,6.129],[-1.07,11.572],[27.721,5.39],[27.773,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[958.677,698.305]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0},{"ind":70,"ty":4,"nm":"c","parent":26,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[-16,-94,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1028.805,662.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1057.066,662.516],[1057.066,672.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1000.544,662.516],[1000.544,672.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.241,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1028.805,675.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1028.805,662.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1028.805,667.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1019.805,674.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1048.066,674.516],[1048.066,684.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[991.544,674.516],[991.544,684.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.241,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1019.805,687.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1019.805,674.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1019.805,679.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1028.805,687.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1057.066,687.516],[1057.066,697.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1000.544,687.516],[1000.544,697.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.241,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1028.805,700.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1028.805,687.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1028.805,692.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-1.682],[7.233,0],[0,1.682],[-7.234,0]],"o":[[0,1.682],[-7.234,0],[0,-1.682],[7.233,0]],"v":[[13.097,0],[0,3.046],[-13.097,0],[0,-3.046]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1020.805,700.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[1049.066,700.516],[1049.066,710.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[992.544,700.516],[992.544,710.516]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[0,0]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,0],[0,-0.172],[-15.608,0],[0,3.63],[0.007,0.06]],"o":[[-0.056,0.168],[0,3.63],[15.608,0],[0,-0.06],[0,0]],"v":[[-28.167,-3.542],[-28.26,-3.031],[0,3.542],[28.26,-3.031],[28.241,-3.21]],"c":false}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1020.805,713.547]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-3.63],[15.608,0],[0,3.63],[-15.608,0]],"o":[[0,3.63],[-15.608,0],[0,-3.63],[15.608,0]],"v":[[28.261,0],[0,6.572],[-28.261,0],[0,-6.572]],"c":true}},"nm":"P"},{"ty":"st","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":2,"lj":2,"nm":"S"},{"ty":"tr","p":{"a":0,"k":[1020.805,700.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[0,-4.941],[0.424,-3.041],[7.424,0],[4.639,6.182],[0,2.251],[-10.078,0]],"o":[[0,1.713],[-4.5,4.02],[-6.592,0],[-0.054,-3.818],[0,-5.043],[10.079,0]],"v":[[28.261,-5],[27.837,6.129],[1.088,11.572],[-28.207,5.39],[-28.261,-4.646],[0,-11.572]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.894,0.737,0.027,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[1020.805,705.516]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0},{"ind":71,"ty":4,"nm":"b","parent":27,"sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[30,-114,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[100,100,100],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ks":{"a":0,"k":{"i":[[-1.599,-114.088],[77.845,-30.921],[3.198,101.826],[-101.123,46.915]],"o":[[5.331,115.762],[-117.65,39.451],[0,-126.35],[98.798,-37.851]],"v":[[95.429,-23.191],[9.426,103.692],[-85.299,30.121],[9.426,-105.292]],"c":true}},"nm":"P"},{"ty":"fl","c":{"a":0,"k":[0.043,0.106,0.204,1]},"o":{"a":0,"k":100},"r":1,"nm":"F"},{"ty":"tr","p":{"a":0,"k":[973.054,702.158]},"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"r":{"a":0,"k":0},"o":{"a":0,"k":100},"sk":{"a":0,"k":0},"sa":{"a":0,"k":0},"nm":"T"}],"nm":"G"}],"ip":0,"op":64,"st":0}]}],"layers":[{"ind":1,"ty":0,"nm":"E","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[333.5,110,0],"l":2},"a":{"a":0,"k":[960,540,0],"l":2},"s":{"a":0,"k":[73,73,100],"l":2}},"ao":0,"w":1920,"h":1080,"ip":0,"op":64,"st":0}],"markers":[]}
\ No newline at end of file
diff --git a/assets/images/chatbubbles.svg b/assets/images/chatbubbles.svg
new file mode 100644
index 000000000000..6194c43e631e
--- /dev/null
+++ b/assets/images/chatbubbles.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.8.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;}
+</style>
+<path class="st0" d="M1.1,9.6c0.1,0.2,0.2,0.4,0.2,0.6l-0.7,3.3C0.5,13.9,0.8,14.1,1,14l3.6-1.9C4.8,12,5,12,5.1,12
+	c0.6,0.1,1.2,0.2,1.9,0.2c3.9,0,7-2.5,7-5.6S10.9,1,7,1C3.1,1,0,3.5,0,6.6C0,7.7,0.4,8.7,1.1,9.6z M13,17.2c-3.2,0-5.9-1.7-6.7-4
+	c0.2,0,0.5,0,0.7,0c4.2,0,8-2.8,8-6.6c0-0.1,0-0.2,0-0.4c2.9,0.7,5,2.8,5,5.4c0,1.1-0.4,2.1-1.1,3c-0.1,0.2-0.2,0.4-0.2,0.6l0.7,3.3
+	c0.1,0.3-0.2,0.5-0.5,0.4l-3.6-1.9C15.2,17,15,17,14.9,17C14.3,17.1,13.6,17.2,13,17.2z"/>
+</svg>
diff --git a/assets/images/expensify-card.svg b/assets/images/expensify-card.svg
new file mode 100644
index 000000000000..f95e3ed20288
--- /dev/null
+++ b/assets/images/expensify-card.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 235 148" style="enable-background:new 0 0 235 148;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#002E22;}
+	.st1{fill:#03D47C;}
+	.st2{fill:#085239;}
+	.st3{fill:#FFFAF0;}
+</style>
+<rect class="st0" width="235" height="148"/>
+<path class="st1" d="M109,38h12.3v-3.6h-7.8V31h6.3v-3.7h-6.3v-3.2h7.8v-3.6H109V38z"/>
+<path class="st1" d="M136.6,24.3h-5.4l-1.8,3.3l-1.9-3.3h-5.6l4.5,6.6l-4.8,7h5.4l2.2-3.7l2.1,3.7h5.6l-4.8-7L136.6,24.3z"/>
+<path class="st1" d="M145.1,24L145.1,24c-1.5,0-2.8,0.6-3.8,1.8v-1.4h-4.1v19.4h4.4V37c0.8,0.8,2,1.4,3.5,1.4c3.6,0,6.1-2.8,6.1-7.2
+	C151.2,26.8,148.8,24,145.1,24L145.1,24z M144.1,34.7c-1.7,0-2.7-1.3-2.7-3.5s1-3.5,2.7-3.5c1.7,0,2.7,1.3,2.7,3.5
+	C146.8,33.4,145.8,34.7,144.1,34.7z"/>
+<path class="st1" d="M159,34.9c-1.4,0-2.4-0.8-2.6-2.8h9.4v-0.6c0-4.3-2.4-7.5-7-7.5c-3.3,0-7,1.8-7,7.2c0,4.4,2.8,7.2,7.2,7.2
+	c2.6,0,5.8-0.9,6.9-5h-4.5C161.1,34.1,160.6,34.9,159,34.9L159,34.9z M158.8,27.3c1.3,0,2.1,0.7,2.3,2.3h-4.6
+	C156.8,27.8,157.8,27.3,158.8,27.3L158.8,27.3z"/>
+<path class="st1" d="M174.4,24c-1.5,0-2.9,0.7-3.8,1.9v-1.6h-4.1V38h4.4v-7.6c0-1.8,0.9-2.7,2.2-2.7c1.3,0,2.1,0.6,2.1,2.6V38h4.4
+	v-8C179.6,25.7,177.8,24,174.4,24L174.4,24z"/>
+<path class="st1" d="M195.7,18.1c-1.4,0-2.3,1-2.3,2.3c0,1.3,1,2.3,2.3,2.3s2.3-1,2.3-2.3C198.1,19.1,197.1,18.1,195.7,18.1z"/>
+<path class="st1" d="M198,24.4h-4.4V38h4.4V24.4z"/>
+<path class="st1" d="M187.7,29.5l-1.1-0.2c-1.2-0.3-1.6-0.8-1.6-1.3c0-0.8,0.6-1.2,1.7-1.2c1.3,0,2,0.4,2,1.7h3.8
+	c-0.1-2.9-1.8-4.6-6-4.6c-3.6,0-5.8,1.4-5.8,4.4c0,2.4,1.6,3.5,5.3,4.3l1.1,0.3c1.2,0.3,1.6,0.8,1.6,1.3c0,0.8-0.7,1.1-1.8,1.1
+	c-1.5,0-2.2-0.6-2.4-1.8h-4.3c0.2,3.3,2.5,4.9,6.5,4.9c4,0,6.4-1.5,6.4-4.5C193.1,31.4,191.4,30.3,187.7,29.5L187.7,29.5z"/>
+<path class="st1" d="M215.2,24.4L215.2,24.4l-2.5,8.3l-2.4-8.3h-5.7v-0.4c0-1.1,0.8-2.2,2.1-2.2h0.6v-3.6h-0.9
+	c-3.8,0.1-6.3,2.7-6.3,6.1v0.2h-1.7v4h1.7V38h4.4v-9.6h2.5l3.3,9.2l-0.6,1.4c-0.4,1-0.9,1.4-1.8,1.4c-0.5,0-0.9,0-1.6-0.2l-0.3,3.6
+	c0.7,0.2,1.5,0.3,2.5,0.3c2.6,0,4-1.1,5.3-4.6l5.7-15.1L215.2,24.4L215.2,24.4z"/>
+<path class="st2" d="M39.5,72.2h-3.8c-1,0-1.8,0.8-1.8,1.8v7c0,1,0.8,1.8,1.8,1.8h3.8c1,0,1.8-0.8,1.8-1.8v-7
+	C41.4,73,40.5,72.2,39.5,72.2z"/>
+<path class="st2" d="M39.6,61.6h-3.8c-1,0-1.8,0.8-1.8,1.8v5.2c0,1,0.8,1.8,1.8,1.8h3.8c1,0,1.8-0.8,1.8-1.8v-5.2
+	C41.5,62.4,40.6,61.6,39.6,61.6z"/>
+<path class="st2" d="M49.1,73.9h-3.8c-1,0-1.8,0.8-1.8,1.8v5.2c0,1,0.8,1.8,1.8,1.8h3.8c1,0,1.8-0.8,1.8-1.8v-5.2
+	C50.9,74.7,50.1,73.9,49.1,73.9z"/>
+<path class="st2" d="M48.9,61.6H45c-1,0-1.8,0.8-1.8,1.8v7.5c0,1,0.8,1.8,1.8,1.8h3.8c1,0,1.8-0.8,1.8-1.8v-7.5
+	C50.7,62.4,49.9,61.6,48.9,61.6z"/>
+<path class="st2" d="M32.1,81.1l0-18c0-0.9-0.8-1.7-1.7-1.7l-6.2,0c-0.5,0-1,0.2-1.3,0.7l-2.1,2.7c-0.2,0.3-0.4,0.7-0.4,1l0,13.1
+	c0,0.3,0.1,0.7,0.3,1l1.6,2.3c0.3,0.5,0.8,0.7,1.4,0.7l6.7,0C31.3,82.7,32.1,82,32.1,81.1L32.1,81.1z"/>
+<path class="st3" d="M198,110.3l-3,14.3h-3.6l3-14.3H198L198,110.3z M213.1,119.5l1.9-5.4l1.1,5.4H213.1z M217.1,124.6h3.3
+	l-2.9-14.3h-3.1c-0.7,0-1.2,0.4-1.5,1l-5.4,13.3h3.7l0.7-2.1h4.6L217.1,124.6z M207.7,120c0-3.8-5.1-4-5.1-5.7c0-0.5,0.5-1,1.5-1.2
+	c0.5-0.1,1.9-0.1,3.6,0.6l0.7-3.1c-0.8-0.3-2-0.6-3.3-0.6c-3.6,0-6.1,2-6.1,4.7c0,2.1,1.7,3.2,3.2,3.9c1.4,0.7,1.8,1.1,1.8,1.8
+	c0,0.9-1.1,1.4-2.2,1.4c-1.8,0-2.8-0.5-3.7-0.9l-0.7,3.2c0.8,0.4,2.4,0.8,4,0.8C205.2,124.8,207.7,122.9,207.7,120z M192.9,110.3
+	l-5.8,14.3h-3.8l-2.8-11.4c-0.2-0.7-0.3-0.9-0.8-1.3c-0.9-0.5-2.3-0.9-3.6-1.2l0.1-0.4h6.1c0.7,0,1.5,0.5,1.7,1.5l1.5,8.3l3.7-9.8
+	H192.9L192.9,110.3z"/>
+<path class="st3" d="M187.8,133c-0.2,0.1-0.7,0.3-1.2,0.3c-1.3,0-2.3-0.9-2.3-2.5c0-1.5,1-2.6,2.5-2.6c0.6,0,1,0.2,1.2,0.3l-0.2,0.4
+	c-0.2-0.1-0.6-0.2-0.9-0.2c-1.1,0-1.8,0.8-1.8,2.1c0,1.2,0.7,2,1.8,2c0.4,0,0.7-0.1,1-0.2L187.8,133z"/>
+<path class="st3" d="M189,131.4c0,0.8,0.4,1.4,1,1.4c0.6,0,1-0.6,1-1.4c0-0.6-0.2-1.4-1-1.4C189.4,130,189,130.7,189,131.4z
+	 M191.8,131.3c0,1.3-0.9,1.9-1.7,1.9c-0.9,0-1.7-0.7-1.7-1.8c0-1.2,0.7-1.9,1.7-1.9C191.1,129.5,191.8,130.3,191.8,131.3z"/>
+<path class="st3" d="M192.7,130.5c0-0.3,0-0.7,0-0.9h0.6v0.6c0.2-0.3,0.5-0.7,1.1-0.7c0.5,0,0.8,0.3,1,0.7c0.1-0.2,0.2-0.3,0.4-0.4
+	c0.2-0.2,0.4-0.3,0.7-0.3c0.5,0,1.2,0.3,1.2,1.5v2.1h-0.6v-2c0-0.7-0.2-1.1-0.7-1.1c-0.3,0-0.7,0.3-0.7,0.6c0,0.1-0.1,0.2-0.1,0.3
+	v2.1h-0.6v-2.1c0-0.6-0.2-0.9-0.7-0.9c-0.4,0-0.7,0.3-0.7,0.6c0,0.1-0.1,0.2-0.1,0.3v2.1h-0.6L192.7,130.5L192.7,130.5z"/>
+<path class="st3" d="M198.7,130.5c0-0.3,0-0.7,0-0.9h0.5v0.6c0.2-0.3,0.5-0.7,1.1-0.7c0.5,0,0.8,0.3,1,0.7c0.1-0.2,0.2-0.3,0.4-0.4
+	c0.2-0.2,0.4-0.3,0.7-0.3c0.5,0,1.2,0.3,1.2,1.5v2.1h-0.6v-2c0-0.7-0.2-1.1-0.7-1.1c-0.3,0-0.7,0.3-0.7,0.6c0,0.1-0.1,0.2-0.1,0.3
+	v2.1h-0.6v-2.1c0-0.6-0.2-0.9-0.7-0.9c-0.4,0-0.7,0.3-0.7,0.6c0,0.1-0.1,0.2-0.1,0.3v2.1h-0.6V130.5L198.7,130.5z"/>
+<path class="st3" d="M207,131c0-0.4-0.2-1-0.8-1c-0.7,0-0.9,0.6-0.9,1H207z M205.1,131.5c0,0.9,0.6,1.2,1.2,1.2
+	c0.4,0,0.7-0.1,0.9-0.2l0.1,0.4c-0.2,0.1-0.6,0.3-1.2,0.3c-1.1,0-1.7-0.7-1.7-1.8c0-1,0.6-1.9,1.6-1.9c1.2,0,1.4,1,1.4,1.6
+	c0,0.2,0,0.3,0,0.3L205.1,131.5L205.1,131.5z"/>
+<path class="st3" d="M208.5,130.7c0-0.4,0-0.8,0-1.1h0.6v0.7c0.2-0.5,0.5-0.8,0.9-0.8c0.1,0,0.1,0,0.2,0v0.6c-0.1,0-0.2,0-0.2,0
+	c-0.4,0-0.7,0.3-0.8,0.9c0,0.1,0,0.2,0,0.3v1.9h-0.6V130.7L208.5,130.7z"/>
+<path class="st3" d="M213.4,133c-0.2,0.1-0.5,0.2-1,0.2c-1,0-1.7-0.7-1.7-1.8s0.7-1.9,1.8-1.9c0.3,0,0.7,0.1,0.8,0.2l-0.2,0.5
+	c-0.2-0.1-0.4-0.2-0.7-0.2c-0.7,0-1.2,0.6-1.2,1.4c0,0.9,0.5,1.3,1.2,1.3c0.3,0,0.6-0.1,0.7-0.2L213.4,133z"/>
+<path class="st3" d="M214.3,133.1v-3.5h0.6v3.5H214.3z M214.9,128.6c0,0.3-0.2,0.4-0.4,0.4c-0.2,0-0.4-0.2-0.4-0.4
+	c0-0.3,0.2-0.4,0.4-0.4C214.8,128.2,214.9,128.4,214.9,128.6z"/>
+<path class="st3" d="M217.9,131.3c-0.7,0-1.4,0.1-1.4,0.8c0,0.4,0.2,0.6,0.6,0.6c0.4,0,0.7-0.3,0.8-0.6c0-0.1,0-0.2,0-0.2V131.3z
+	 M218.5,132.2c0,0.3,0,0.6,0.1,0.9H218l-0.1-0.4c-0.2,0.3-0.6,0.5-1.1,0.5c-0.7,0-1.1-0.5-1.1-1c0-0.9,0.7-1.3,2.1-1.3v-0.1
+	c0-0.3-0.1-0.9-0.7-0.8c-0.3,0-0.7,0.1-0.9,0.3l-0.2-0.4c0.2-0.2,0.7-0.3,1.2-0.3c1.1,0,1.3,0.8,1.3,1.5V132.2z"/>
+<path class="st3" d="M219.7,127.9h0.7v5.1h-0.7V127.9z"/>
+</svg>
diff --git a/assets/images/google-meet.svg b/assets/images/google-meet.svg
index 138a11859321..980cd102f67a 100644
--- a/assets/images/google-meet.svg
+++ b/assets/images/google-meet.svg
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?><svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 122.88 101.11" style="enable-background:new 0 0 122.88 101.11" xml:space="preserve"><style type="text/css"><![CDATA[
-	.st0{fill:#188038;}
-	.st1{fill:#1967D2;}
-	.st2{fill:#EA4335;}
-	.st3{fill:#FBBC04;}
-	.st4{fill:#34A853;}
-	.st5{fill:#4285F4;}
-]]></style><g><polygon class="st0" points="69.51,50.56 81.49,64.25 97.6,74.54 100.41,50.65 97.6,27.28 81.18,36.32 69.51,50.56"/><path class="st1" d="M0,72.32v20.36c0,4.66,3.77,8.43,8.43,8.43h20.36L33,85.72l-4.21-13.4l-13.97-4.21L0,72.32L0,72.32z"/><polygon class="st2" points="28.79,0 0,28.79 14.82,33 28.79,28.79 32.93,15.57 28.79,0"/><polygon class="st5" points="0,72.32 28.79,72.32 28.79,28.79 0,28.79 0,72.32"/><path class="st4" d="M115.99,12.19L97.6,27.28v47.26l18.47,15.15c2.77,2.16,6.81,0.19,6.81-3.32V15.45 C122.88,11.89,118.74,9.94,115.99,12.19L115.99,12.19z M69.51,50.56v21.77H28.79v28.79h60.39c4.66,0,8.43-3.77,8.43-8.43V74.54 L69.51,50.56L69.51,50.56z"/><path class="st3" d="M89.18,0H28.79v28.79h40.73v21.77L97.6,27.28V8.43C97.6,3.77,93.83,0,89.18,0L89.18,0z"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
+<path d="M17.1,4.7l-2.4,2.1V4.2c0-0.6-0.5-1.2-1.1-1.2H5.7L2,7v8.8C2,16.5,2.5,17,3.1,17h10.5c0.6,0,1.1-0.5,1.1-1.2v-2.5l2.4,2.1
+	c0.4,0.3,0.9,0,0.9-0.5V5.1C18,4.6,17.5,4.4,17.1,4.7z M11.1,13H5.7V7h5.3V13z"/>
+</svg>
diff --git a/assets/images/zoom-icon.svg b/assets/images/zoom-icon.svg
index 6c6ed03cb2f3..24d019654795 100644
--- a/assets/images/zoom-icon.svg
+++ b/assets/images/zoom-icon.svg
@@ -1 +1,7 @@
-<svg height="64" viewBox="0 0 32 32" width="64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><clipPath id="a"><path d="m-200-175h1000v562h-1000z"/></clipPath><clipPath id="b"><circle cx="107" cy="106" r="102"/></clipPath><clipPath id="c"><circle cx="107" cy="106" r="100"/></clipPath><clipPath id="d"><circle cx="107" cy="106" r="92"/></clipPath><clipPath id="e"><path clip-rule="evenodd" d="m135 94.06 26-19c2.27-1.85 4-1.42 4 2v57.94c0 3.84-2.16 3.4-4 2l-26-19zm-88-16.86v43.2a17.69 17.69 0 0 0 17.77 17.6h63a3.22 3.22 0 0 0 3.23-3.2v-43.2a17.69 17.69 0 0 0 -17.77-17.6h-63a3.22 3.22 0 0 0 -3.23 3.2z"/></clipPath><g clip-path="url(#a)" transform="translate(0 -178)"><path d="m232 61h366v90h-366z" fill="#4a8cff"/></g><g clip-path="url(#a)" transform="matrix(.156863 0 0 .156863 -.784314 -.627496)"><g clip-path="url(#b)"><path d="m0-1h214v214h-214z" fill="#e5e5e4"/></g><g clip-path="url(#c)"><path d="m2 1h210v210h-210z" fill="#fff"/></g><g clip-path="url(#d)"><path d="m10 9h194v194h-194z" fill="#4a8cff"/></g><g clip-path="url(#e)"><path d="m42 69h128v74h-128z" fill="#fff"/></g></g><g clip-path="url(#a)" transform="translate(0 -178)"><path d="m232 19.25h180v38.17h-180z" fill="#90908f"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.3.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
+<path d="M18,19H4.4c-0.9,0-1.7-0.5-2.2-1.3c-0.5-0.9-0.3-2,0.4-2.8l9.4-9.5H5.4C3.5,5.4,2,3.9,2,2h12.5c0.9,0,1.7,0.5,2.2,1.3
+	c0.5,0.9,0.3,2-0.4,2.8l-9.4,9.5h7.8C16.5,15.6,18,17.1,18,19L18,19z"/>
+</svg>
diff --git a/contributingGuides/ACCESSIBILITY.md b/contributingGuides/ACCESSIBILITY.md
new file mode 100644
index 000000000000..b94cbf3087c8
--- /dev/null
+++ b/contributingGuides/ACCESSIBILITY.md
@@ -0,0 +1,47 @@
+# Accessibility of pressable components
+
+### Base Components 
+
+- **GenericPressable**: A basic pressable component with generic functionality. It should generally only be used to creating a new, custom pressable components. Avoid using it directly.
+
+- **PressableWithFeedback**: A pressable component that provides standarised visual and haptic feedback upon pressing.
+
+- **PressableWithoutFeedback**: A pressable component without any visual or haptic feedback.
+
+- **PressableWithoutFocus**: A pressable component without visible efect of focus.
+
+- **PressableWithDelayToggle**:  A pressable component that briefly disables then re-enables after a short delay upon pressing.
+
+Accessibility props are unified across all platforms.
+
+### Creating accessible flows
+When implementing pressable components, it's essential to create accessible flows to ensure that users with disabilities can efficiently interact with the app.
+
+- ensure that after performing press focus is set on the correct next element - this is especially important for keyboard users who rely on focus to navigate the app. All Pressable components have a `nextFocusRef` prop that can be used to set the next focusable element after the pressable component. This prop accepts a ref to the next focusable element. For example, if you have a button that opens a modal, you can set the next focus to the first focusable element in the modal. This way, when the user presses the button, focus will be set on the first focusable element in the modal, and the user can continue navigating the modal using the keyboard.
+
+- size of any pressable component should be at least 44x44dp. This is the minimum size recommended by Apple and Google for touch targets. If the pressable component is smaller than `44x44dp`, it will be difficult for users with motor disabilities to interact with it. Pressable components have a `autoHitSlop` prop that can be used to automatically increase the size of the pressable component to `44x44dp`. This prop accepts a boolean value. If set to true, the pressable component will automatically increase its touchable size to 44x44dp. If set to false, the pressable component will not increase its size. By default, this prop is set to false.
+
+- ensure that the pressable component has a label and hint. This is especially important for users with visual disabilities who rely on screen readers to navigate the app. All Pressable components have a `accessibilitylabel` prop that can be used to set the label of the pressable component. This prop accepts a string value. All Pressable components also have a `accessibilityHint` prop that can be used to set the hint of the pressable component. This prop accepts a string value. The accessibilityHint prop is optional. If not set, the pressable component will fallback to the accessibilityLabel prop. For example, if you have a button that opens a modal, you can set the accessibilityLabel to "Open modal" and the accessibilityHint to "Opens a modal with more information". This way, when the user focuses on the button, the screen reader will read "Open modal. Opens a modal with more information". This will help the user understand what the button does and what to expect after pressing it.
+
+- the `enableInScreenReaderStates` prop proves invaluable when aiming to enhance the accessibility of clickable elements, particularly when desiring to enlarge the clickable area of a component, such as an entire row. This can be especially useful, for instance, when dealing with tables where only a small portion of a row, like a checkbox, might traditionally trigger an action. By employing this prop, developers can ensure that the entirety of a designated component, in this case a row, is made accessible to users employing screen readers. This creates a more inclusive user experience, allowing individuals relying on screen readers to interact with the component effortlessly. For instance, in a table, using this prop on a row component enables users to click anywhere within the row to trigger an action, significantly improving accessibility and user-friendliness.
+
+- ensure that the pressable component has a role. This is especially important for users with visual disabilities who rely on screen readers to navigate the app. All Pressable components have a `accessibilityRole` prop that can be used to set the role of the pressable component.
+
+### Testing for accessibility
+It's important to test for accessibility to ensure that the created component has accessibility properties set correctly. This can be done using the following tools:
+
+- **iOS**  
+For iOS, you can use the `accessibility inspector` app to test for accessibility. You can find it in the Xcode menu under `Xcode > Open Developer Tool > Accessibility Inspector`. This app allows you to inspect the accessibility properties of any element on the screen. You can also use it to simulate different accessibility settings, such as VoiceOver, color blindness, and more. It's a great tool for testing whether created component has accessibility properties set/passed correctly.
+
+- **Android**  
+For Android, you can use the [accessibility scanner](https://support.google.com/accessibility/android/answer/6376570) app to test for accessibility. You can find it in the Google Play Store. This app allows you to inspect the accessibility properties of any element on the screen. You can also use it to simulate different accessibility settings, such as TalkBack, color blindness, and more. It's a great tool for testing whether created component has accessibility properties set correctly. The [result of the accessibility scanner](https://support.google.com/accessibility/android/answer/6376559) app has information about content labeling, implementation, touch target size and low contrast
+This tool requires an installed APK to test on. 
+
+- **Web/Desktop**  
+On Mac, you can use the [VoiceOver](https://www.apple.com/accessibility/mac/vision/) app to test for accessibility. You can find it in the Mac menu under `System Preferences > Accessibility > VoiceOver` or by pressing `Cmd + F5`. This app allows you to inspect the accessibility properties of any element on the screen. You can also use it to simulate different accessibility settings, such as VoiceOver, color blindness, and more. It's a great tool for testing whether created component has accessibility properties set correctly. 
+
+
+### Valuable resources
+- [Apple accessibility guidelines](https://developer.apple.com/design/human-interface-guidelines/accessibility/overview/introduction/)
+- [Google accessibility guidelines](https://developer.android.com/guide/topics/ui/accessibility)
+- [Web accessibility guidelines](https://www.w3.org/WAI/standards-guidelines/wcag/)
\ No newline at end of file
diff --git a/contributingGuides/CONTRIBUTING.md b/contributingGuides/CONTRIBUTING.md
index ae2b98ece85b..621673e5a487 100644
--- a/contributingGuides/CONTRIBUTING.md
+++ b/contributingGuides/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 Welcome! Thanks for checking out the New Expensify app and taking the time to contribute!
 
 ## Getting Started
-If you would like to become an Expensify contributor, the first step is to read this document in its entirety. The second step is to review the README guidelines [here](https://github.com/Expensify/App/blob/main/README.md) to understand our coding philosophy and for a general overview of the code repository (i.e. how to run the app locally, testing, storage, our app philosophy, etc). Please read both documents before asking questions, as it may be covered within the documentation.
+If you would like to become an Expensify contributor, the first step is to read this document in its **entirety**. The second step is to review the README guidelines [here](https://github.com/Expensify/App/blob/main/README.md) to understand our coding philosophy and for a general overview of the code repository (i.e. how to run the app locally, testing, storage, our app philosophy, etc). Please read both documents before asking questions, as it may be covered within the documentation.
 
 #### Test Accounts
 You can create as many accounts as needed in order to test your changes directly from [the app](https://new.expensify.com/). An initial account can be created when logging in for the first time, and additional accounts can be created by opening the "New Chat" or "Group Chat" pages via the Global Create menu, inputting a valid email or phone number, and tapping the user's avatar.
@@ -47,7 +47,7 @@ Note: if you are hired for an Upwork job and have any job-specific questions, pl
 If you've found a vulnerability, please email security@expensify.com with the subject `Vulnerability Report` instead of creating an issue.
 
 ## Payment for Contributions
-We hire and pay external contributors via Upwork.com. If you'd like to be paid for contributing or reporting a bug, please create an Upwork account, apply for an available job in [GitHub](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22), and finally apply for the job in Upwork once your proposal gets selected in GitHub. If you think your compensation should be increased for a specific job, you can request a reevaluation by commenting in the Github issue where the Upwork job was posted. 
+We hire and pay external contributors via Upwork.com. If you'd like to be paid for contributing or reporting a bug, please create an Upwork account, apply for an available job in [GitHub](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22), and finally apply for the job in Upwork once your proposal gets selected in GitHub. Please make sure your Upwork profile is **fully verified** before applying, otherwise you run the risk of not being paid. If you think your compensation should be increased for a specific job, you can request a reevaluation by commenting in the Github issue where the Upwork job was posted. 
 
 Payment for your contributions and bug reports will be made no less than 7 days after the pull request is deployed to production to allow for [regression](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#regressions) testing. If you have not received payment after 8 days of the PR being deployed to production, and there are no [regressions](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#regressions), please add a comment to the issue mentioning the BugZero team member (Look for the melvin-bot "Triggered auto assignment to... (`Bug`)" to see who this is).
 
@@ -89,13 +89,13 @@ It’s possible that you found a new bug that we haven’t posted as a job to th
 Please follow these steps to propose a job or raise a bug:
 
 1. Check to ensure a GH issue does not already exist for this job in the [New Expensify Issue list](https://github.com/Expensify/App/issues).
-2. Check to ensure the `Bug:` or `Feature Request:` was not already posted in Slack (specifically the #expensify-bugs or #expensify-open-source [Slack channels](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#slack-channels)). Use your best judgement by searching for similar titles and issue descriptions.
+2. Check to ensure the `Bug:` or `Feature Request:` was not already posted in Slack (specifically the #expensify-bugs or #expensify-open-source [Slack channels](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#slack-channels)). Use your best judgement by searching for similar titles, words and issue descriptions.
 3. If your bug or new feature matches with an existing issue, please comment on that Slack thread or GitHub issue with your findings if you think it will help solve the issue.
 4. If there is no existing GitHub issue or Upwork job, check if the issue is happening on prod (as opposed to only happening on dev)
 5. If the issue is just in dev then it means it's a new issue and has not been deployed to production. In this case, you should try to find the offending PR and comment in the issue tied to the PR and ask the assigned users to add the `DeployBlockerCash` label. If you can't find it, follow the reporting instructions in the next item, but note that the issue is a regression only found in dev and not in prod.
-6. If the issue happens in main, staging, or production then report the issue(s) in the #expensify-bugs Slack channel, using the report bug workflow. You can do this by clicking 'Workflow > report Bug', or typing `/Report bug`. View [this guide](https://github.com/Expensify/App/blob/main/contributingGuides/HOW_TO_CREATE_A_PLAN.md) for help creating a plan when proposing a feature request.
+6. If the issue happens in main, staging, or production then report the issue(s) in the #expensify-bugs Slack channel, using the report bug workflow. You can do this by clicking 'Workflow > report Bug', or typing `/Report bug`. View [this guide](https://github.com/Expensify/App/blob/main/contributingGuides/HOW_TO_CREATE_A_PLAN.md) for help creating a plan when proposing a feature request. Please verify the bug's presence on **every** platform mentioned in the bug report template, and confirm this with a screen recording.. 
     - **Important note/reminder**: never share any information pertaining to a customer of Expensify when describing the bug. This includes, and is not limited to, a customer's name, email, and contact information. 
-7. The Expensify team will review your job proposal in the appropriate slack channel. If you've provided a quality proposal that we choose to implement, a GitHub issue will be created and your Slack handle will be included in the original post after `Issue reported by:`
+7. The Applause team will review your job proposal in the appropriate slack channel. If you've provided a quality proposal that we choose to implement, a GitHub issue will be created and your Slack handle will be included in the original post after `Issue reported by:`
 8. If an external contributor other than yourself is hired to work on the issue, you will also be hired for the same job in Upwork to receive your payout. No additional work is required. If the issue is fixed internally, a dedicated job will be created to hire and pay you after the issue is fixed. 
 9. Payment will be made 7 days after code is deployed to production if there are no regressions. If a regression is discovered, payment will be issued 7 days after all regressions are fixed. 
 
diff --git a/contributingGuides/PROPTYPES_CONVERSION_TABLE.md b/contributingGuides/PROPTYPES_CONVERSION_TABLE.md
index e7584f82a351..7e1c1dda4262 100644
--- a/contributingGuides/PROPTYPES_CONVERSION_TABLE.md
+++ b/contributingGuides/PROPTYPES_CONVERSION_TABLE.md
@@ -1,5 +1,7 @@
 # Expensify PropTypes Conversion Table
 
+This is a reference to help you convert PropTypes to TypeScript types. 
+
 ## Table of Contents
 
 - [Important Considerations](#important-considerations)
diff --git a/contributingGuides/STYLE.md b/contributingGuides/STYLE.md
index ce59438a0681..0a88ecd7bda8 100644
--- a/contributingGuides/STYLE.md
+++ b/contributingGuides/STYLE.md
@@ -491,6 +491,19 @@ When writing a function component you must ALWAYS add a `displayName` property a
     export default Avatar;
 ```
 
+## Forwarding refs
+
+When forwarding a ref define named component and pass it directly to the `forwardRef`. By doing this we remove potential extra layer in React tree in form of anonymous component.
+
+```javascript
+    function FancyInput(props, ref) {
+        ...
+        return <input {...props} ref={ref} />
+    }
+
+    export default React.forwardRef(FancyInput)
+```
+
 ## Stateless components vs Pure Components vs Class based components vs Render Props - When to use what?
 
 Class components are DEPRECATED. Use function components and React hooks.
@@ -567,6 +580,28 @@ A `useEffect()` that does not include referenced props or state in its dependenc
 
 There are pros and cons of each, but ultimately we have standardized on using the `function` keyword to align things more with modern React conventions. There are also some minor cognitive overhead benefits in that you don't need to think about adding and removing brackets when encountering an implicit return. The `function` syntax also has the benefit of being able to be hoisted where arrow functions do not.
 
+## How do I auto-focus a TextInput using `useFocusEffect()`?
+
+```javascript
+const focusTimeoutRef = useRef(null);
+
+useFocusEffect(useCallback(() => {
+    focusTimeoutRef.current = setTimeout(() => textInputRef.current.focus(), CONST.ANIMATED_TRANSITION);
+    return () => {
+        if (!focusTimeoutRef.current) {
+            return;
+        }
+        clearTimeout(focusTimeoutRef.current);
+    };
+}, []));
+```
+
+This works better than using `onTransitionEnd` because -
+1. `onTransitionEnd` is only fired for the top card in the stack, and therefore does not fire on the new top card when popping a card off the stack. For example - pressing the back button to go from the workspace invite page to the workspace members list.
+2. Using `InteractionsManager.runAfterInteractions` with `useFocusEffect` will interrupt an in-progress transition animation.
+
+Note - This is a solution from [this PR](https://github.com/Expensify/App/pull/26415). You can find detailed discussion in comments.
+
 # Onyx Best Practices
 
 [Onyx Documentation](https://github.com/expensify/react-native-onyx)
diff --git a/contributingGuides/TS_CHEATSHEET.md b/contributingGuides/TS_CHEATSHEET.md
index df6d70b5ae90..1e330dafb7cf 100644
--- a/contributingGuides/TS_CHEATSHEET.md
+++ b/contributingGuides/TS_CHEATSHEET.md
@@ -43,7 +43,9 @@
 - [1.2](#forwardRef) **`forwardRef`**
 
   ```ts
-  import { forwardRef, useRef, ReactNode } from "react";
+  // CustomTextInput.tsx
+
+  import { forwardRef, useRef, ReactNode, ForwardedRef } from "react";
   import { TextInput, View } from "react-native";
 
   export type CustomTextInputProps = {
@@ -51,16 +53,18 @@
     children?: ReactNode;
   };
 
-  const CustomTextInput = forwardRef<TextInput, CustomTextInputProps>(
-    (props, ref) => {
-      return (
-        <View>
-          <TextInput ref={ref} />
-          {props.children}
-        </View>
-      );
-    }
-  );
+  function CustomTextInput(props: CustomTextInputProps, ref: ForwardedRef<TextInput>) {
+    return (
+      <View>
+        <TextInput ref={ref} />
+        {props.children}
+      </View>
+    );
+  };
+
+  export default forwardRef(CustomTextInput);
+
+  // ParentComponent.tsx
 
   function ParentComponent() {
     const ref = useRef<TextInput>();
diff --git a/desktop/main.js b/desktop/main.js
index b19bef060ba9..5e184d529afd 100644
--- a/desktop/main.js
+++ b/desktop/main.js
@@ -12,7 +12,7 @@ const CONST = require('../src/CONST').default;
 const Localize = require('../src/libs/Localize');
 
 const port = process.env.PORT || 8082;
-const {DESKTOP_SHORTCUT_ACCELERATOR} = CONST;
+const {DESKTOP_SHORTCUT_ACCELERATOR, LOCALES} = CONST;
 
 app.setName('New Expensify');
 
@@ -36,25 +36,40 @@ function pasteAsPlainText(browserWindow) {
     browserWindow.webContents.insertText(text);
 }
 
-// Initialize the right click menu
-// See https://github.com/sindresorhus/electron-context-menu
-// Add the Paste and Match Style command to the context menu
-contextMenu({
-    append: (defaultActions, parameters, browserWindow) => [
-        new MenuItem({
-            // Only enable the menu item for Editable context which supports paste
-            visible: parameters.isEditable && parameters.editFlags.canPaste,
-            role: 'pasteAndMatchStyle',
-            accelerator: DESKTOP_SHORTCUT_ACCELERATOR.PASTE_AND_MATCH_STYLE,
-        }),
-        new MenuItem({
-            label: Localize.translate(CONST.LOCALES.DEFAULT, 'desktopApplicationMenu.pasteAsPlainText'),
-            visible: parameters.isEditable && parameters.editFlags.canPaste && clipboard.readText().length > 0,
-            accelerator: DESKTOP_SHORTCUT_ACCELERATOR.PASTE_AS_PLAIN_TEXT,
-            click: () => pasteAsPlainText(browserWindow),
-        }),
-    ],
-});
+/**
+ * Initialize the right-click menu
+ * See https://github.com/sindresorhus/electron-context-menu
+ *
+ * @param {String} preferredLocale - The current user language to be used for translating menu labels.
+ * @returns {Function} A dispose function to clean up the created context menu.
+ */
+
+function createContextMenu(preferredLocale = LOCALES.DEFAULT) {
+    return contextMenu({
+        labels: {
+            cut: Localize.translate(preferredLocale, 'desktopApplicationMenu.cut'),
+            paste: Localize.translate(preferredLocale, 'desktopApplicationMenu.paste'),
+            copy: Localize.translate(preferredLocale, 'desktopApplicationMenu.copy'),
+        },
+        append: (defaultActions, parameters, browserWindow) => [
+            new MenuItem({
+                // Only enable the menu item for Editable context which supports paste
+                visible: parameters.isEditable && parameters.editFlags.canPaste,
+                role: 'pasteAndMatchStyle',
+                accelerator: DESKTOP_SHORTCUT_ACCELERATOR.PASTE_AND_MATCH_STYLE,
+                label: Localize.translate(preferredLocale, 'desktopApplicationMenu.pasteAndMatchStyle'),
+            }),
+            new MenuItem({
+                label: Localize.translate(preferredLocale, 'desktopApplicationMenu.pasteAsPlainText'),
+                visible: parameters.isEditable && parameters.editFlags.canPaste && clipboard.readText().length > 0,
+                accelerator: DESKTOP_SHORTCUT_ACCELERATOR.PASTE_AS_PLAIN_TEXT,
+                click: () => pasteAsPlainText(browserWindow),
+            }),
+        ],
+    });
+}
+
+let disposeContextMenu = createContextMenu();
 
 // Send all autoUpdater logs to a log file: ~/Library/Logs/new.expensify.desktop/main.log
 // See https://www.npmjs.com/package/electron-log
@@ -522,6 +537,8 @@ const mainWindow = () => {
 
                 ipcMain.on(ELECTRON_EVENTS.LOCALE_UPDATED, (event, updatedLocale) => {
                     Menu.setApplicationMenu(Menu.buildFromTemplate(localizeMenuItems(initialMenuTemplate, updatedLocale)));
+                    disposeContextMenu();
+                    disposeContextMenu = createContextMenu(updatedLocale);
                 });
 
                 ipcMain.on(ELECTRON_EVENTS.REQUEST_VISIBILITY, (event) => {
diff --git a/docs/404.html b/docs/404.html
index 1773388c6923..4338293218cc 100644
--- a/docs/404.html
+++ b/docs/404.html
@@ -1,8 +1,8 @@
 ---
 permalink: /404.html
 ---
-<div class="centered-content with-lhn">
-    <img class="icon" src="/assets/images/hourglass.svg" />
+<div class="centered-content">
+    <img class="icon" src="/assets/images/circle-hourglass.svg" />
     <strong>Hmm it's not here...</strong>
     <div>That page is nowhere to be found.</div>
 </div>
diff --git a/docs/_data/_routes.yml b/docs/_data/_routes.yml
index 32c8a5211ee2..c6733ac11715 100644
--- a/docs/_data/_routes.yml
+++ b/docs/_data/_routes.yml
@@ -1,26 +1,144 @@
 home:
   href: home
   title: Welcome to ExpensifyHelp!
-  description: Find the answers to all of your questions about receipts, expenses, corporate cards, or anything else in the spend management universe.
-
-# Hubs are comprised of sections and articles. Sections contain multiple related articles, but there can be standalone articles as well
-hubs:
-  - href: split-bills
-    title: Split bills
-    description: With only a couple of clicks, split bills with your friends or coworkers.
-    icon: /assets/images/paper-airplane.svg
-
-  - href: request-money
-    title: Request money
-    icon: /assets/images/money-case.svg
-    description: Request money for work expenses, bills, or a night out with friends.
-
-  - href: playbooks
-    title: Playbooks
-    icon: /assets/images/playbook.svg
-    description: Best practices for how to best deploy Expensify for your business
-
-  - href: other
-    title: Other
-    description: Everything else you're looking for is right here.
-    icon: /assets/images/lightbulb.svg
+  description: Find answers by using the search bar in the left-hand menu or by clicking the version of Expensify you're using to access the relevant resources.
+
+platforms:
+  - href: expensify-classic
+    title: Expensify Classic
+    hub-title: Expensify Classic - Help & Resources
+    hub-description: Questions? Find the answers by clicking a Category or using the search bar located in the left-hand menu.
+    url: www.expensify.com
+    description: "Your account settings look like this:"
+    image: /assets/images/settings-old-dot.svg
+  
+    # Hubs are comprised of sections and articles. Sections contain multiple related articles, but there can be standalone articles as well
+    hubs:
+      - href: getting-started
+        title: Getting Started
+        icon: /assets/images/accounting.svg
+        description: From setting up your account to ensuring you get the most out of Expensify’s suite of features, click here to get started on streamlining your expense management journey.
+
+      - href: account-settings
+        title: Account Settings
+        icon: /assets/images/gears.svg
+        description: Discover how to personalize your profile, add secondary logins, and grant delegated access to employees with our comprehensive guide on Account Settings.
+
+      - href: bank-accounts-and-credit-cards
+        title: Bank Accounts & Credit Cards
+        icon: /assets/images/bank-card.svg
+        description: Find out how to connect Expensify to your financial institutions, track credit card transactions, and best practices for reconciling company cards.
+
+      - href: billing-and-subscriptions
+        title: Billing & Subscriptions
+        icon: /assets/images/money-wings.svg
+        description: Here is where you can review Expensify's billing and subscription options, plan types, and payment methods.
+
+      - href: expense-and-report-features
+        title: Expense & Report Features
+        icon: /assets/images/money-receipt.svg
+        description: From enabling automatic expense auditing to tracking attendees, here is where you can review tips and tutorials to streamline expense management.
+
+      - href: expensify-card
+        title: Expensify Card
+        icon: /assets/images/hand-card.svg
+        description: Explore how the Expensify Card combines convenience and security to enhance everyday business transactions. Discover how to apply for, oversee, and maximize your card perks here.
+
+      - href: exports
+        title: Exports
+        icon: /assets/images/monitor.svg
+        description: From exporting reports to creating custom templates, here is where you can learn more about Expensify's versatile export options.
+
+      - href: get-paid-back
+        title: Get Paid Back
+        icon: /assets/images/money-into-wallet.svg
+        description: Whether you submit an expense report or an invoice, find out here how to ensure a smooth and timely payback process every time.
+
+      - href: integrations
+        title: Integrations
+        icon: /assets/images/workflow.svg
+        description: Enhance Expensify’s capabilities by integrating it with your accounting or HR software. Here is where you can learn more about creating a synchronized financial management ecosystem.
+
+      - href: manage-employees-and-report-approvals
+        title: Manage Employees & Report Approvals
+        icon: /assets/images/envelope-receipt.svg
+        description: Master the art of overseeing employees and reports by utilizing Expensify’s automation features and approval workflows.
+      
+      - href: policy-and-domain-settings
+        title: Policy & Domain Settings
+        icon: /assets/images/shield.svg
+        description: Discover how to set up and manage policies, define user permissions, and implement compliance rules to maintain a secure and compliant financial management landscape.
+      
+      - href: send-payments
+        title: Send Payments
+        icon: /assets/images/money-wings.svg
+        description: Uncover step-by-step guidance on sending direct reimbursements to employees, paying an invoice to a vendor, and utilizing third-party payment options.
+  
+  - href: new-expensify
+    title: New Expensify
+    hub-title: New Expensify - Help & Resources
+    hub-description: Questions? Find the answers by clicking a Category or using the search bar located in the left-hand menu.
+    url: new.expensify.com
+    description: "Your account settings look like this:"
+    image: /assets/images/settings-new-dot.svg
+  
+    hubs:
+      - href: getting-started
+        title: Getting Started
+        icon: /assets/images/accounting.svg
+        description: From setting up your account to ensuring you get the most out of Expensify’s suite of features, click here to get started on streamlining your expense management journey.
+      
+      - href: account-settings
+        title: Account Settings
+        icon: /assets/images/gears.svg
+        description: Discover how to personalize your profile, add secondary logins, and grant delegated access to employees with our comprehensive guide on Account Settings.
+
+      - href: bank-accounts-and-credit-cards
+        title: Bank Accounts & Credit Cards
+        icon: /assets/images/bank-card.svg
+        description: Find out how to connect Expensify to your financial institutions, track credit card transactions, and best practices for reconciling company cards.
+      
+      - href: billing-and-plan-types
+        title: Billing & Plan Types
+        icon: /assets/images/money-wings.svg
+        description: Here is where you can review Expensify's billing and subscription options, plan types, and payment methods.
+      
+      - href: expense-and-report-features
+        title: Expense & Report Features
+        icon: /assets/images/money-receipt.svg
+        description: From enabling automatic expense auditing to tracking attendees, here is where you can review tips and tutorials to streamline expense management.
+
+      - href: expensify-card
+        title: Expensify Card
+        icon: /assets/images/hand-card.svg
+        description: Explore how the Expensify Card combines convenience and security to enhance everyday business transactions. Discover how to apply for, oversee, and maximize your card perks here.
+      
+      - href: exports
+        title: Exports
+        icon: /assets/images/monitor.svg
+        description: From exporting reports to creating custom templates, here is where you can learn more about Expensify's versatile export options.
+
+      - href: get-paid-back
+        title: Get Paid Back
+        icon: /assets/images/money-into-wallet.svg
+        description: Whether you submit an expense report or an invoice, find out here how to ensure a smooth and timely payback process every time.
+      
+      - href: integrations
+        title: Integrations
+        icon: /assets/images/workflow.svg
+        description: Enhance Expensify’s capabilities by integrating it with your accounting or HR software. Here is where you can learn more about creating a synchronized financial management ecosystem.
+
+      - href: manage-employees-and-report-approvals
+        title: Manage Employees & Report Approvals
+        icon: /assets/images/envelope-receipt.svg
+        description: Master the art of overseeing employees and reports by utilizing Expensify’s automation features and approval workflows.
+
+      - href: send-payments
+        title: Send Payments
+        icon: /assets/images/money-wings.svg
+        description: Uncover step-by-step guidance on sending direct reimbursements to employees, paying an invoice to a vendor, and utilizing third-party payment options.
+
+      - href: workspace-and-domain-settings
+        title: Workspace & Domain Settings
+        icon: /assets/images/shield.svg
+        description: Discover how to set up and manage your workspace, define user permissions, and implement domain-level rules.
diff --git a/docs/_includes/article-card.html b/docs/_includes/article-card.html
index a088e5e406db..b66affebb4ae 100644
--- a/docs/_includes/article-card.html
+++ b/docs/_includes/article-card.html
@@ -1,6 +1,6 @@
-<a class="card" href="/articles/{{ include.hub }}/{{ include.href }}">
+<a class="article-card" href="/articles/{{ include.platform }}/{{ include.hub }}/{{ include.href }}">
     <div class="body">
-        <h3 class="title">{{ include.title }}</h3>
+        <h4 class="title">{{ include.title }}</h4>
     </div>
     <div class="right-icon">
         <img src="/assets/images/arrow-right.svg" class="base-icon"></img>
diff --git a/docs/_includes/hub-card.html b/docs/_includes/hub-card.html
index 36bf3bc36e6a..859ee0004394 100644
--- a/docs/_includes/hub-card.html
+++ b/docs/_includes/hub-card.html
@@ -1,8 +1,8 @@
-{% assign hub = site.data.routes.hubs | where: "href", include.href | first %}
-
-<a class="card" href="/hubs/{{ hub.href }}">
+{% assign hub = include.hub %}
+{% assign platform = include.platform %}
+<a class="hub-card" href="/{{ platform }}/hubs/{{ hub.href }}">
     <div class="row">
-        <div class="left-icon">
+        <div>
             <img class="icon" src="{{ hub.icon }}" alt="{{ hub.href }}"/>
         </div>
         <div class="body">
diff --git a/docs/_includes/hub.html b/docs/_includes/hub.html
index acdc901a38f6..7f1e25243c09 100644
--- a/docs/_includes/hub.html
+++ b/docs/_includes/hub.html
@@ -1,5 +1,8 @@
-{% assign activeHub = page.url | remove: "/hubs/" | remove: ".html" %}
-{% assign hub = site.data.routes.hubs | where: "href", activeHub | first %}
+{% assign activePlatform = page.url | replace: '/', ' ' | truncatewords: 1 | remove:'...' %}
+{% assign platform = site.data.routes.platforms | where: "href", activePlatform | first %}
+
+{% assign activeHub = page.url | remove: activePlatform | remove: "/hubs/" | remove: "/" | remove: ".html" %}
+{% assign hub = platform.hubs | where: "href", activeHub | first %}
 
 <h1 class="title">
     {{ hub.title }}
@@ -9,27 +12,13 @@ <h1 class="title">
     {{ hub.description }}
 </p>
 
-{% for section in hub.sections %}
-    <section>
-        <h2 id="{{ section.href }}">
-            {{ section.title }}
-        </h2>
-
-        <div class="cards-group">
-            {% for article in section.articles %}
-                {% assign article_href = section.href | append: '/' | append: article.href %}
-                {% include article-card.html hub=hub.href href=article_href title=article.title %}
-            {% endfor %}
-        </div>
-    </section>
-{% endfor %}
-
-{% if hub.articles %}
-    <section>
-        <div class="cards-group">
-            {% for article in hub.articles %}
-                {% include article-card.html hub=hub.href href=article.href title=article.title %}
-            {% endfor %}
-        </div>
-    </section>
-{% endif %}
+<section>
+    <div class="cards-group">
+        {% for section in hub.sections %}
+            {% include section-card.html platform=activePlatform hub=hub.href section=section.href title=section.title %}
+        {% endfor %}
+        {% for article in hub.articles %}
+            {% include article-card.html hub=hub.href href=article.href title=article.title platform=activePlatform %}
+        {% endfor %}
+    </div>
+</section>
diff --git a/docs/_includes/lhn-article-link.html b/docs/_includes/lhn-article-link.html
index f9c4f31f0dbe..91c0de4aacce 100644
--- a/docs/_includes/lhn-article-link.html
+++ b/docs/_includes/lhn-article-link.html
@@ -1,5 +1,5 @@
 <li>
-    <a href="/articles/{{ include.hub }}/{{ include.href }}" class="link">
+    <a href="/articles/{{ include.platform }}/{{ include.hub }}/{{ include.href }}" class="link">
         {{ include.title }}
     </a>
 </li>
diff --git a/docs/_includes/lhn-template.html b/docs/_includes/lhn-template.html
index 0473e5da9e9c..80302f33f52e 100644
--- a/docs/_includes/lhn-template.html
+++ b/docs/_includes/lhn-template.html
@@ -1,4 +1,13 @@
-{% assign activeHub = page.url | remove: "/hubs/" | remove: ".html" %}
+{% assign urlArray = page.url | replace: '/', ' ' | split: " " %}
+
+{% assign activePlatform = urlArray[0] %}
+{% assign platform = site.data.routes.platforms | where: "href", activePlatform | first %}
+
+{% assign activeHub = urlArray[2] %}
+{% assign hub = platform.hubs | where: "href", activeHub | first %}
+
+{% assign activeSection = urlArray[3] | remove: ".html" %}
+{% assign section = hub.sections | where: "href", activeSection | first %}
 
 <ul class="lhn-items">
     <li class="home-link">
@@ -9,38 +18,65 @@
         {% endif %}
     </li>
 
-    {% for hub in site.data.routes.hubs %}
-        {% if hub.href == activeHub %}
+    {% for platform in site.data.routes.platforms %}
+        {% if platform.href == activePlatform %}
             <li>
-                <div class="icon-with-link selected">
+                <a href="/" class="icon-with-link selected">
                     <img src="/assets/images/down.svg" class="base-icon"></img>
-                    <span>{{ hub.title }}</span>
-                </div>
-                <ul class="nested-treeview">
-                    <!-- First display sections with nested articles -->
-                    {% for section in hub.sections %}
+                    <span>{{ platform.title }}</span>
+                </a>
+                {% for hub in platform.hubs %}
+                <ul>
+                    {% if hub.href == activeHub %}
+                        <a href="/{{ activePlatform }}/hubs/" class="icon-with-link selected">
+                            <img src="/assets/images/down.svg" class="base-icon"></img>
+                            <span>{{ hub.title }}</span>
+                        </a>
+                        <ul class="nested-treeview">
+                            {% for section in hub.sections %}
+                                <li>
+                                    {% if section.href == activeSection %}
+                                        <a href="/{{ activePlatform }}/hubs/{{ hub.href }}" class="icon-with-link selected">
+                                            <img src="/assets/images/down.svg" class="base-icon"></img>
+                                            <span>{{ section.title }}</span>
+                                        </a>
+                                        <ul>
+                                            {% for article in section.articles %}
+                                                {% assign article_href = section.href | append: '/' | append: article.href %}
+                                                {% include lhn-article-link.html platform=activePlatform hub=hub.href href=article_href title=article.title %}
+                                            {% endfor %}
+                                        </ul>
+                                    {% else %}
+                                        <a href="{{ section.href }}" class="icon-with-link link">
+                                            <img src="/assets/images/arrow-right.svg" class="base-icon"></img>
+                                            {{ section.title }}
+                                        </a>
+                                    {% endif %}
+                                    
+                                </li>
+                            {% endfor %}
+
+                            {% for article in hub.articles %}
+                                {% include lhn-article-link.html platform=activePlatform hub=hub.href href=article.href title=article.title %}
+                            {% endfor %}
+                        </ul>
+                    {% else %}
                         <li>
-                            <a href="#{{ section.href }}" class="link">{{ section.title }}</a>
-                            <ul>
-                                {% for article in section.articles %}
-                                    {% assign article_href = section.href | append: '/' | append: article.href %}
-                                    {% include lhn-article-link.html hub=hub.href href=article_href title=article.title %}
-                                {% endfor %}
-                            </ul>
+                            <a href="/{{ activePlatform }}/hubs/{{ hub.href }}" class="icon-with-link link">
+                                <img src="/assets/images/arrow-right.svg" class="base-icon"></img>
+                                {{ hub.title }}
+                            </a>
                         </li>
-                    {% endfor %}
-
-                    <!-- Then display standalone articles -->
-                    {% for article in hub.articles %}
-                        {% include lhn-article-link.html hub=hub.href href=article.href title=article.title %}
-                    {% endfor %}
+                    {% endif %}
                 </ul>
+                {% endfor %}
             </li>
+
         {% else %}
             <li>
-                <a href="/hubs/{{ hub.href }}" class="icon-with-link link">
+                <a href="/{{ platform.href }}/hubs" class="icon-with-link link">
                     <img src="/assets/images/arrow-right.svg" class="base-icon"></img>
-                    {{ hub.title }}
+                    {{ platform.title }}
                 </a>
             </li>
         {% endif %}
diff --git a/docs/_includes/platform-card.html b/docs/_includes/platform-card.html
new file mode 100644
index 000000000000..7123f18a679a
--- /dev/null
+++ b/docs/_includes/platform-card.html
@@ -0,0 +1,22 @@
+{% assign platform = site.data.routes.platforms | where: "href", include.href | first %}
+
+<a class="platform-card" href="/{{ platform.href }}/hubs">
+    <div class="row">
+        <div class="body">
+            <div class="header">
+                <div>
+                    <h3 class="title with-margin">{{ platform.title }}</h3>
+                    <p class="url">{{ platform.url }}</p>    
+                </div>
+                <div class="select-button">
+                    <button class="success">Select</button>
+                </div>
+            </div>
+
+            <p class="description">{{ platform.description }}</p>
+        </div>
+        <div class="platform-screenshot">
+            <img src="{{ platform.image }}" alt="{{ platform.href }}"/>
+        </div>
+    </div>
+</a>
diff --git a/docs/_includes/platform.html b/docs/_includes/platform.html
new file mode 100644
index 000000000000..6aa88f9208ae
--- /dev/null
+++ b/docs/_includes/platform.html
@@ -0,0 +1,18 @@
+{% assign selectedPlatform = page.url | remove: "/hubs/" | remove: "/" | remove: ".html" %}
+{% assign platform = site.data.routes.platforms | where: "href", selectedPlatform | first %}
+<div class="homepage">
+    <h1 class="title">{{ platform.hub-title }}</h1>
+
+    <p>{{ platform.hub-description }}</p>
+
+    <div class="platform-cards-group">
+        {% for hub in platform.hubs %}
+            {% include hub-card.html hub=hub platform=selectedPlatform %}
+        {% endfor %}
+    </div>
+
+    <div class="cards-group">
+        <!-- Concierge button anchored globally (rendered on narrow screens) -->
+        {% include floating-concierge-button.html id="floating-concierge-button-global" %}
+    </div>
+</div>
diff --git a/docs/_includes/section-card.html b/docs/_includes/section-card.html
new file mode 100644
index 000000000000..9500983d4d28
--- /dev/null
+++ b/docs/_includes/section-card.html
@@ -0,0 +1,8 @@
+<a class="card" href="/{{ include.platform }}/hubs/{{ include.hub }}/{{ include.section }}">
+    <div class="body">
+        <h4 class="title">{{ include.title }}</h4>
+    </div>
+    <div class="right-icon">
+        <img src="/assets/images/arrow-right.svg" class="base-icon"></img>
+    </div>
+</a>
diff --git a/docs/_includes/section.html b/docs/_includes/section.html
new file mode 100644
index 000000000000..786e7d997462
--- /dev/null
+++ b/docs/_includes/section.html
@@ -0,0 +1,23 @@
+{% assign urlArray = page.url | replace: '/', ' ' | split: " " %}
+
+{% assign activePlatform = urlArray[0] %}
+{% assign platform = site.data.routes.platforms | where: "href", activePlatform | first %}
+
+{% assign activeHub = urlArray[2] %}
+{% assign hub = platform.hubs | where: "href", activeHub | first %}
+
+{% assign activeSection = urlArray[3] | remove: ".html" %}
+{% assign section = hub.sections | where: "href", activeSection | first %}
+
+<h1 class="title">
+    {{ section.title }}
+</h1>
+
+<section>
+    <div class="cards-group">
+        {% for article in section.articles %}
+            {% assign article_href = section.href | append: '/' | append: article.href %}
+            {% include article-card.html hub=hub.href href=article_href title=article.title platform=activePlatform %}
+        {% endfor %}
+    </div>
+</section>
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 209d14de0f48..de3fbc203243 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -96,12 +96,5 @@ <h2 class="title with-margin">Didn't find what you were looking for?</h2>
             {% include footer.html %}
         </div>
     </div>
-
-    <!-- Use hidden input to pass hubs data to main.js -->
-    <input
-        id="hubs-data"
-        type="hidden"
-        value={{ site.data.routes.hubs | map: 'href' | jsonify }}
-    />
 </body>
 </html>
diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss
index bc9d19bfca11..3ad2276713da 100644
--- a/docs/_sass/_main.scss
+++ b/docs/_sass/_main.scss
@@ -299,7 +299,6 @@ button {
     }
 
     .selected {
-        cursor: auto;
         font-weight: bold;
         color: $color-text;
     }
@@ -457,6 +456,15 @@ button {
     }
 }
 
+
+.platform-cards-group {
+    @extend .cards-group;
+
+    @include breakpoint($breakpoint-desktop) {
+        grid-template-columns: 33.33% 33.33% 33.33%;
+    }
+}
+
 .card {
     display: flex;
     flex-wrap: nowrap;
@@ -476,21 +484,55 @@ button {
         flex-basis:100%;
     }
 
-    .left-icon {
+    .body {
         display: flex;
-        align-items: center;
-        padding-right: 28px;
+        flex-wrap: nowrap;
+        flex-direction: column;
+        flex-grow: 2;
+    }
 
-        img {
-            width: 64px;
-        }
+    h3.title {
+        font-family: "ExpensifyNewKansas", "Helvetica Neue", "Helvetica", Arial, sans-serif;
     }
 
+    h3.title,
+    h4.title {
+        padding: 0;
+        margin: 0;
+    }
+
+    p.description,
+    p.url {
+        margin: 0;
+        font-weight: normal;
+    }
+}
+
+.article-card {
+    @extend .card;
+
     .right-icon {
         display: flex;
         align-items: center;
         padding-left: 16px;
     }
+}
+
+.platform-card {
+    @extend .card;
+    .row {
+        flex-direction: column;
+    }
+
+    .platform-screenshot {
+        display: flex;
+        align-items: center;
+
+        img {
+            border-radius: 12px;
+            width: 100%;
+        }
+    }
 
     .submit-button {
         display: flex;
@@ -505,27 +547,62 @@ button {
     }
 
     .body {
-        display: flex;
-        flex-wrap: nowrap;
-        flex-direction: column;
-        flex-grow: 2;
-    }
+        .header {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
 
-    h3.title {
-        padding: 0;
-        margin: 0;
+            .select-button {
+                display: flex;
+                .success {
+                    align-items: flex-end;
+                    font-size: 0.8em;
+                }
+            }
+        }
+    }
 
+    h3.title,
+    h4.title {
         &.with-margin {
             margin: 0 0 4px 0;
         }
     }
 
-
+    h3.title {
+        font-size: 1.4em;
+        font-weight: normal;
+    }
 
     p.description {
+        padding: 20px 0 20px 0;
+    }
+
+    p.url {
         padding: 0;
-        margin: 0;
+        font-size: 0.8em;
+        color: $color-gray-label;
+    }
+}
+
+.hub-card {
+    @extend .card;
+    padding: 24px;
+
+    .row {
+        flex-direction: column;
+    }
+
+    h3.title {
+        font-size: 1.2em;
         font-weight: normal;
+        &.with-margin {
+            margin: 20px 0 8px 0;
+        }
+    }
+
+    p.description {
+        padding: 0;
 
         &.with-min-height {
             min-height: 68px;
@@ -564,30 +641,13 @@ button {
 }
 
 .centered-content {
-    height: 240px;
+    width: 100%;
+    height: calc(100vh - 56px);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
     text-align: center;
-    font-size: larger;
-    position: absolute;
-    top: calc((100vh - 240px) / 2);
-
-    width: 380px;
-    right: calc((100vw - 380px) / 2);
-    @include breakpoint($breakpoint-tablet) {
-        width: 500px;
-        right: calc((100vw - 500px) / 2);
-    }
-
-    &.with-lhn {
-        right: calc((100vw - 380px) / 2);
-
-        @include breakpoint($breakpoint-tablet) {
-            right: calc((100vw - 320px - 500px ) / 2);
-        }
-
-        @include breakpoint($breakpoint-desktop) {
-            right: calc((100vw - 420px - 500px) / 2);
-        }
-    }
 
     div {
         margin-top: 8px;
diff --git a/docs/_sass/_search-bar.scss b/docs/_sass/_search-bar.scss
index ce085878af46..a5cc8ae2ff20 100644
--- a/docs/_sass/_search-bar.scss
+++ b/docs/_sass/_search-bar.scss
@@ -23,14 +23,25 @@ $color-gray-label: $color-gray-label;
 #sidebar-search {
     background-color: $color-appBG;
     width: 375px;
-    height: 100vh;
     position: fixed;
-    display: block;
+    display: flex;
+    flex-direction: column;
+    bottom: 0;
     top: 0;
     right: 0;
     z-index: 2;
 }
 
+#sidebar-search > div:last-child {
+    flex-grow: 1;
+    overflow-y: auto;
+    -ms-overflow-style: none;
+    scrollbar-width: none;
+    &::-webkit-scrollbar {
+        display: none;
+    }
+}
+
 @media only screen and (max-width: $breakpoint-tablet) {
     #sidebar-search {
         width: 100%;
@@ -156,10 +167,6 @@ label.search-label {
     background-color: $color-appBG;
     border: $color-appBG;
     font-family: "ExpensifyNeue", "Helvetica Neue", "Helvetica", Arial, sans-serif !important;
-    max-height: 80vh;
-    overflow-y: scroll;
-    -ms-overflow-style: none;
-    scrollbar-width: none;
 }
 
 /* Hide the scrollbar */
diff --git a/docs/articles/expensify-classic/account-settings/Account-Details.md b/docs/articles/expensify-classic/account-settings/Account-Details.md
new file mode 100644
index 000000000000..46a6c6ba0c25
--- /dev/null
+++ b/docs/articles/expensify-classic/account-settings/Account-Details.md
@@ -0,0 +1,5 @@
+---
+title: Account Details
+description: Account Details
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/account-settings/Close-Account.md b/docs/articles/expensify-classic/account-settings/Close-Account.md
new file mode 100644
index 000000000000..5e18490fc357
--- /dev/null
+++ b/docs/articles/expensify-classic/account-settings/Close-Account.md
@@ -0,0 +1,5 @@
+---
+title: Close Account
+description: Close Account
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/account-settings/Merge-Accounts.md b/docs/articles/expensify-classic/account-settings/Merge-Accounts.md
new file mode 100644
index 000000000000..073c74346d75
--- /dev/null
+++ b/docs/articles/expensify-classic/account-settings/Merge-Accounts.md
@@ -0,0 +1,5 @@
+---
+title: Merge Accounts
+description: Merge Accounts
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/account-settings/Preferences.md b/docs/articles/expensify-classic/account-settings/Preferences.md
new file mode 100644
index 000000000000..532da4d8a986
--- /dev/null
+++ b/docs/articles/expensify-classic/account-settings/Preferences.md
@@ -0,0 +1,5 @@
+---
+title: Preferences
+description: Preferences
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/account-settings/Profile-Settings.md b/docs/articles/expensify-classic/account-settings/Profile-Settings.md
new file mode 100644
index 000000000000..3b2a0b830926
--- /dev/null
+++ b/docs/articles/expensify-classic/account-settings/Profile-Settings.md
@@ -0,0 +1,5 @@
+---
+title: Profile Settings
+description: Profile Settings
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/Global-Reimbursement.md b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/Global-Reimbursement.md
new file mode 100644
index 000000000000..073d3a9bd700
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/Global-Reimbursement.md
@@ -0,0 +1,5 @@
+---
+title: Global Reimbursement
+description: Global Reimbursement
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/Personal-Credit-Cards.md b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/Personal-Credit-Cards.md
new file mode 100644
index 000000000000..f89729b69586
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/Personal-Credit-Cards.md
@@ -0,0 +1,5 @@
+---
+title: Personal Credit Cards
+description: Personal Credit Cards
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/business-bank-accounts/Business-Bank-Accounts-AUD.md b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/business-bank-accounts/Business-Bank-Accounts-AUD.md
new file mode 100644
index 000000000000..7c789942a2b3
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/business-bank-accounts/Business-Bank-Accounts-AUD.md
@@ -0,0 +1,5 @@
+---
+title: Business Bank Accounts - AUD
+description: Business Bank Accounts - AUD
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/business-bank-accounts/Business-Bank-Accounts-USD.md b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/business-bank-accounts/Business-Bank-Accounts-USD.md
new file mode 100644
index 000000000000..375b00d62eac
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/business-bank-accounts/Business-Bank-Accounts-USD.md
@@ -0,0 +1,5 @@
+---
+title: Business Bank Accounts - USD
+description: Business Bank Accounts - USD
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/ANZ.md b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/ANZ.md
new file mode 100644
index 000000000000..7e6a76ecee24
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/ANZ.md
@@ -0,0 +1,6 @@
+---
+title: ANZ
+description: A guide to integrate with your ANZ card
+---
+## Resource Coming Soon!
+Coming Soon!!
diff --git a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Brex.md b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Brex.md
new file mode 100644
index 000000000000..a060e37146a5
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Brex.md
@@ -0,0 +1,5 @@
+---
+title: Brex
+description: Brex
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/CSV-Import.md b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/CSV-Import.md
new file mode 100644
index 000000000000..6debce6240ff
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/CSV-Import.md
@@ -0,0 +1,5 @@
+---
+title: CSV Import
+description: CSV Import
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Commercial-Card-Feeds.md b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Commercial-Card-Feeds.md
new file mode 100644
index 000000000000..25d11561755d
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Commercial-Card-Feeds.md
@@ -0,0 +1,5 @@
+---
+title: Commercial Card Feeds
+description: Commercial Card Feeds
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Connect-Company-Cards.md b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Connect-Company-Cards.md
new file mode 100644
index 000000000000..112c3b9617c9
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Connect-Company-Cards.md
@@ -0,0 +1,5 @@
+---
+title: Connect Company Cards
+description: Connect Company Cards
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Direct-Bank-Connections.md b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Direct-Bank-Connections.md
new file mode 100644
index 000000000000..f1d939ca9c89
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Direct-Bank-Connections.md
@@ -0,0 +1,5 @@
+---
+title: Direct Bank Connections
+description: Direct Bank Connections
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Export-To-GL-Accounts.md b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Export-To-GL-Accounts.md
new file mode 100644
index 000000000000..85b534338b53
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Export-To-GL-Accounts.md
@@ -0,0 +1,5 @@
+---
+title: Export to GL Accounts
+description: Export to GL Accounts
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Reconciliation.md b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Reconciliation.md
new file mode 100644
index 000000000000..b51329f2a803
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Reconciliation.md
@@ -0,0 +1,5 @@
+---
+title: Reconciliation
+description: Reconciliation
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Troubleshooting.md b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Troubleshooting.md
new file mode 100644
index 000000000000..e3d1307e6a05
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Troubleshooting.md
@@ -0,0 +1,5 @@
+---
+title: Troubleshooting
+description: Troubleshooting
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/deposit-accounts/Deposit-Accounts-AUS.md b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/deposit-accounts/Deposit-Accounts-AUS.md
new file mode 100644
index 000000000000..61e6dfd95e38
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/deposit-accounts/Deposit-Accounts-AUS.md
@@ -0,0 +1,5 @@
+---
+title: Deposit Accounts - AUD
+description: Deposit Accounts - AUD
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/bank-accounts-and-credit-cards/deposit-accounts/Deposit-Accounts-USD.md b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/deposit-accounts/Deposit-Accounts-USD.md
new file mode 100644
index 000000000000..19010be95980
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-credit-cards/deposit-accounts/Deposit-Accounts-USD.md
@@ -0,0 +1,5 @@
+---
+title: Deposit Accounts - USD
+description: Deposit Accounts - USD
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/billing-and-subscriptions/Annual-Subscription.md b/docs/articles/expensify-classic/billing-and-subscriptions/Annual-Subscription.md
new file mode 100644
index 000000000000..8e2aa7d4a377
--- /dev/null
+++ b/docs/articles/expensify-classic/billing-and-subscriptions/Annual-Subscription.md
@@ -0,0 +1,5 @@
+---
+title: Annual Subscription
+description: Annual Subscription
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/billing-and-subscriptions/Billing-Owner.md b/docs/articles/expensify-classic/billing-and-subscriptions/Billing-Owner.md
new file mode 100644
index 000000000000..acb29d91e1d8
--- /dev/null
+++ b/docs/articles/expensify-classic/billing-and-subscriptions/Billing-Owner.md
@@ -0,0 +1,5 @@
+---
+title: Billing-Owner
+description: Billing-Owner
+---
+## Resource Coming Soon!
\ No newline at end of file
diff --git a/docs/articles/expensify-classic/billing-and-subscriptions/Change-Plan-Or-Subscription.md b/docs/articles/expensify-classic/billing-and-subscriptions/Change-Plan-Or-Subscription.md
new file mode 100644
index 000000000000..8ce4283dd17d
--- /dev/null
+++ b/docs/articles/expensify-classic/billing-and-subscriptions/Change-Plan-Or-Subscription.md
@@ -0,0 +1,5 @@
+---
+title: Change Plan or Subscription
+description: Change Plan or Subscription
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/billing-and-subscriptions/Consolidated-Domain-Billing.md b/docs/articles/expensify-classic/billing-and-subscriptions/Consolidated-Domain-Billing.md
new file mode 100644
index 000000000000..24edc553bd29
--- /dev/null
+++ b/docs/articles/expensify-classic/billing-and-subscriptions/Consolidated-Domain-Billing.md
@@ -0,0 +1,5 @@
+---
+title: Consolidated Domain Billing
+description: Consolidated Domain Billing
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/billing-and-subscriptions/Free-Trial.md b/docs/articles/expensify-classic/billing-and-subscriptions/Free-Trial.md
new file mode 100644
index 000000000000..e08aaa3d6094
--- /dev/null
+++ b/docs/articles/expensify-classic/billing-and-subscriptions/Free-Trial.md
@@ -0,0 +1,5 @@
+---
+title: Free Trial
+description: Free Trial
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/billing-and-subscriptions/Individual-Subscription.md b/docs/articles/expensify-classic/billing-and-subscriptions/Individual-Subscription.md
new file mode 100644
index 000000000000..1ace758978aa
--- /dev/null
+++ b/docs/articles/expensify-classic/billing-and-subscriptions/Individual-Subscription.md
@@ -0,0 +1,5 @@
+---
+title: Individual Subscription
+description: Individual Subscription
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/billing-and-subscriptions/Overview.md b/docs/articles/expensify-classic/billing-and-subscriptions/Overview.md
new file mode 100644
index 000000000000..963186916f01
--- /dev/null
+++ b/docs/articles/expensify-classic/billing-and-subscriptions/Overview.md
@@ -0,0 +1,5 @@
+---
+title: Overview
+description: Overview
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/billing-and-subscriptions/Pay-Per-Use-Subscription.md b/docs/articles/expensify-classic/billing-and-subscriptions/Pay-Per-Use-Subscription.md
new file mode 100644
index 000000000000..77aca2a01678
--- /dev/null
+++ b/docs/articles/expensify-classic/billing-and-subscriptions/Pay-Per-Use-Subscription.md
@@ -0,0 +1,5 @@
+---
+title: Pay-per-use Subscription
+description: Pay-per-use Subscription
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/billing-and-subscriptions/Payment-Card.md b/docs/articles/expensify-classic/billing-and-subscriptions/Payment-Card.md
new file mode 100644
index 000000000000..41a1fb96f56f
--- /dev/null
+++ b/docs/articles/expensify-classic/billing-and-subscriptions/Payment-Card.md
@@ -0,0 +1,5 @@
+---
+title: Payment Card
+description: Payment Card
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/billing-and-subscriptions/Tax-Exempt.md b/docs/articles/expensify-classic/billing-and-subscriptions/Tax-Exempt.md
new file mode 100644
index 000000000000..c4948b5b3083
--- /dev/null
+++ b/docs/articles/expensify-classic/billing-and-subscriptions/Tax-Exempt.md
@@ -0,0 +1,5 @@
+---
+title: Tax Exempt
+description: Tax Exempt
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/expense-and-report-features/Attendee-Tracking.md b/docs/articles/expensify-classic/expense-and-report-features/Attendee-Tracking.md
new file mode 100644
index 000000000000..a5b0b26b2610
--- /dev/null
+++ b/docs/articles/expensify-classic/expense-and-report-features/Attendee-Tracking.md
@@ -0,0 +1,5 @@
+---
+title: Attendee Tracking
+description: Attendee Tracking
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/expense-and-report-features/Currency.md b/docs/articles/expensify-classic/expense-and-report-features/Currency.md
new file mode 100644
index 000000000000..e5c9096fa610
--- /dev/null
+++ b/docs/articles/expensify-classic/expense-and-report-features/Currency.md
@@ -0,0 +1,5 @@
+---
+title: Currency
+description: Currency
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/expense-and-report-features/Expense-Rules.md b/docs/articles/expensify-classic/expense-and-report-features/Expense-Rules.md
new file mode 100644
index 000000000000..304c93d1da6d
--- /dev/null
+++ b/docs/articles/expensify-classic/expense-and-report-features/Expense-Rules.md
@@ -0,0 +1,5 @@
+---
+title: Expense Rules
+description: Expense Rules
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/expense-and-report-features/Expense-Types.md b/docs/articles/expensify-classic/expense-and-report-features/Expense-Types.md
new file mode 100644
index 000000000000..3f2e49952c4a
--- /dev/null
+++ b/docs/articles/expensify-classic/expense-and-report-features/Expense-Types.md
@@ -0,0 +1,5 @@
+---
+title: Expense Types
+description: Expense Types
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/expense-and-report-features/Report-Comments.md b/docs/articles/expensify-classic/expense-and-report-features/Report-Comments.md
new file mode 100644
index 000000000000..b7ed120fb28b
--- /dev/null
+++ b/docs/articles/expensify-classic/expense-and-report-features/Report-Comments.md
@@ -0,0 +1,5 @@
+---
+title: Report Comments
+description: Report Comments
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/expense-and-report-features/The-Expenses-Page.md b/docs/articles/expensify-classic/expense-and-report-features/The-Expenses-Page.md
new file mode 100644
index 000000000000..f30dde9efc3d
--- /dev/null
+++ b/docs/articles/expensify-classic/expense-and-report-features/The-Expenses-Page.md
@@ -0,0 +1,5 @@
+---
+title: The Expenses Page
+description: The Expenses Page
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/expense-and-report-features/The-Reports-Page.md b/docs/articles/expensify-classic/expense-and-report-features/The-Reports-Page.md
new file mode 100644
index 000000000000..e72abfcad51a
--- /dev/null
+++ b/docs/articles/expensify-classic/expense-and-report-features/The-Reports-Page.md
@@ -0,0 +1,5 @@
+---
+title: The Reports Page
+description: The Reports Page
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/expensify-card/Auto-Reconciliation.md b/docs/articles/expensify-classic/expensify-card/Auto-Reconciliation.md
new file mode 100644
index 000000000000..85202835a0e4
--- /dev/null
+++ b/docs/articles/expensify-classic/expensify-card/Auto-Reconciliation.md
@@ -0,0 +1,5 @@
+---
+title: Auto-reconciliation
+description: Auto-reconciliation
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/expensify-card/CPA-Card.md b/docs/articles/expensify-classic/expensify-card/CPA-Card.md
new file mode 100644
index 000000000000..dfc1e71192db
--- /dev/null
+++ b/docs/articles/expensify-classic/expensify-card/CPA-Card.md
@@ -0,0 +1,5 @@
+---
+title: CPA Card
+description: CPA Card
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/expensify-card/Card-Settings.md b/docs/articles/expensify-classic/expensify-card/Card-Settings.md
new file mode 100644
index 000000000000..ab212354974a
--- /dev/null
+++ b/docs/articles/expensify-classic/expensify-card/Card-Settings.md
@@ -0,0 +1,5 @@
+---
+title: Card Settings
+description: Card Settings
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/expensify-card/Connect-To-Indirect-Integration.md b/docs/articles/expensify-classic/expensify-card/Connect-To-Indirect-Integration.md
new file mode 100644
index 000000000000..9888edd139ac
--- /dev/null
+++ b/docs/articles/expensify-classic/expensify-card/Connect-To-Indirect-Integration.md
@@ -0,0 +1,5 @@
+---
+title: Connect to Indirect Integration
+description: Connect to Indirect Integration
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/expensify-card/File-A-Dispute.md b/docs/articles/expensify-classic/expensify-card/File-A-Dispute.md
new file mode 100644
index 000000000000..694bce3da059
--- /dev/null
+++ b/docs/articles/expensify-classic/expensify-card/File-A-Dispute.md
@@ -0,0 +1,5 @@
+---
+title: File a Dispute
+description: File a Dispute
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/expensify-card/Get-The-Card.md b/docs/articles/expensify-classic/expensify-card/Get-The-Card.md
new file mode 100644
index 000000000000..e5233a3732a3
--- /dev/null
+++ b/docs/articles/expensify-classic/expensify-card/Get-The-Card.md
@@ -0,0 +1,5 @@
+---
+title: Get the Card
+description: Get the Card
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/expensify-card/Statements.md b/docs/articles/expensify-classic/expensify-card/Statements.md
new file mode 100644
index 000000000000..b48d303a1a9b
--- /dev/null
+++ b/docs/articles/expensify-classic/expensify-card/Statements.md
@@ -0,0 +1,5 @@
+---
+title: Statements
+description: Statements
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/exports/Custom-Templates.md b/docs/articles/expensify-classic/exports/Custom-Templates.md
new file mode 100644
index 000000000000..e01450a730cf
--- /dev/null
+++ b/docs/articles/expensify-classic/exports/Custom-Templates.md
@@ -0,0 +1,5 @@
+---
+title: Custom Templates
+description: Custom Templates
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/exports/Default-Export-Templates.md b/docs/articles/expensify-classic/exports/Default-Export-Templates.md
new file mode 100644
index 000000000000..7650cff38946
--- /dev/null
+++ b/docs/articles/expensify-classic/exports/Default-Export-Templates.md
@@ -0,0 +1,5 @@
+---
+title: Default Export Templates
+description: Default Export Templates
+---
+## Resource Coming Soon!
diff --git a/docs/articles/other/Insights.md b/docs/articles/expensify-classic/exports/Insights.md
similarity index 100%
rename from docs/articles/other/Insights.md
rename to docs/articles/expensify-classic/exports/Insights.md
diff --git a/docs/articles/expensify-classic/get-paid-back/Mileage.md b/docs/articles/expensify-classic/get-paid-back/Mileage.md
new file mode 100644
index 000000000000..248e80e1c115
--- /dev/null
+++ b/docs/articles/expensify-classic/get-paid-back/Mileage.md
@@ -0,0 +1,5 @@
+---
+title: Mileage
+description: Mileage
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/get-paid-back/Per-Diem.md b/docs/articles/expensify-classic/get-paid-back/Per-Diem.md
new file mode 100644
index 000000000000..780e5969c441
--- /dev/null
+++ b/docs/articles/expensify-classic/get-paid-back/Per-Diem.md
@@ -0,0 +1,5 @@
+---
+title: Per Diem
+description: Per Diem
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/get-paid-back/Third-Party-Payments.md b/docs/articles/expensify-classic/get-paid-back/Third-Party-Payments.md
new file mode 100644
index 000000000000..a8cddcdfdd42
--- /dev/null
+++ b/docs/articles/expensify-classic/get-paid-back/Third-Party-Payments.md
@@ -0,0 +1,5 @@
+---
+title: Third Party Payments
+description: Third Party Payments
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/get-paid-back/Trips.md b/docs/articles/expensify-classic/get-paid-back/Trips.md
new file mode 100644
index 000000000000..7efba1875a90
--- /dev/null
+++ b/docs/articles/expensify-classic/get-paid-back/Trips.md
@@ -0,0 +1,5 @@
+---
+title: Trips
+description: Trips
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/get-paid-back/expenses/Apply-Tax.md b/docs/articles/expensify-classic/get-paid-back/expenses/Apply-Tax.md
new file mode 100644
index 000000000000..b5f5ec8be048
--- /dev/null
+++ b/docs/articles/expensify-classic/get-paid-back/expenses/Apply-Tax.md
@@ -0,0 +1,39 @@
+---
+title: Apply Tax
+description: This is article shows you how to apply taxes to your expenses!
+---
+
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# About
+
+There are two types of tax in Expensify: Simple Tax (i.e. one tax rate) and Complex Tax (i.e. more than one tax rate). This article shows you how to apply both to your expenses!
+
+
+# How-to Apply Tax
+
+When Tax Tracking is enabled on a Workspace, the default tax rate is selected under **Settings > Workspace > _Workspace Name_ > Tax**, with the default tax rate applied to all expenses automatically. 
+
+There may be multiple tax rates set up within your Workspace, so if the tax on your receipt is different to the default tax that has been applied, you can select the appropriate rate from the tax drop-down on the web expense editor or the mobile app. 
+
+If the tax amount on your receipt is different to the calculated amount or the tax rate doesn’t show up, you can always manually type in the correct tax amount.
+
+
+# FAQ
+
+## How do I set up multiple taxes (GST/PST/QST) on indirect connections?
+Expenses sometimes have more than one tax applied to them - for example in Canada, expenses can have both a Federal GST and a provincial PST or QST. 
+
+To handle these, you can create a single tax that combines both taxes into a single effective tax rate. For example, if you have a GST of 5% and PST of 7%, adding the two tax rates together gives you an effective tax rate of 12%.
+
+From the Reports page, you can select Reports and then click **Export To > Tax Report** to generate a CSV containing all the expense information, including the split-out taxes.
+
+
+# Deep Dive
+
+If you have a receipt that has more than one tax rate (i.e. Complex Tax) on it, then there are two options for handling this in Expensify!
+
+Many tax authorities do not require the reporting of tax amounts by rate and the easiest approach is to apply the highest rate on the receipt and then modify the tax amount to reflect the amount shown on the receipt if this is less. Please check with your local tax advisor if this approach will be allowed.
+
+Alternatively, you can apply each specific tax rate by splitting the expense into the components that each rate will be applied to. To do this, click on **Split Expense** and apply the correct tax rate to each part.
+
diff --git a/docs/articles/expensify-classic/get-paid-back/expenses/Create-Expenses.md b/docs/articles/expensify-classic/get-paid-back/expenses/Create-Expenses.md
new file mode 100644
index 000000000000..7fa714189542
--- /dev/null
+++ b/docs/articles/expensify-classic/get-paid-back/expenses/Create-Expenses.md
@@ -0,0 +1,128 @@
+---
+title: Create-Expenses.md
+description: This is an article that shows you all the ways that you can create Expenses in Expensify!
+---
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# About
+Whether you're using SmartScan for automatic expense creation, or manually creating, splitting, or duplicating expenses, you can rest assured your expenses will be correctly tracked in Expensify.
+
+# How-to Create Expenses
+## Using SmartScan
+Use the big green camera button within the Expensify mobile app to snap a photo of your physical receipt to have it SmartScanned.
+For digital or emailed receipts, simply forward them to receipts@expensify.com and it will be SmartScanned and added to your Expensify account.
+
+There’s no need to keep the app open and most SmartScans are finished within the hour. If more details are needed, Concierge will reach out to you with a friendly message.
+## Using the Mobile App
+Simply tap the **+** icon in the top-right corner
+Choose **Expense** and then select **Manually Create**. 
+If you don't have a receipt handy or want to add it later, fill in your expense details and click the **Save** button. 
+## Using the Expensify Website
+Log into the Expensify website
+Click on the **Expenses** page and find the **New Expense** dropdown. 
+Select your expense type, hit the **Save** button and you're all set.
+You can then add details like the Merchant and Category, attach a receipt image, and even add a description.
+# How to Split an Expense
+Splitting an expense in Expensify allows you to break down a single expense into multiple expenses. Each split expense is treated as an individual expense which can be categorized and tagged separately. The same receipt image will be attached to all of the split expenses, allowing you to divide a single expense into smaller, more manageable expenses.
+To split an expense on the mobile app:
+
+1. Open an expense.
+2. At the bottom of the screen, tap **More Options**.
+3. Then, use the **Split** button to divide the expense.
+
+To split an expense on the Expensify website:
+
+1. Click on the expense you want to split.
+2. Click on the **Split** button. 
+   - On the Expenses page, this button is at the top.
+   - Within an individual expense, you'll find it at the bottom.
+3. This will automatically be split in two, but you can decide how many expenses you want to split it into by clicking on the **Add Split** button. 
+   - Remember, the total of all pieces must add up to the original expense amount, and no piece can have a $0.00 amount (or you won't be able to save the changes).
+
+# How to Create Bulk Expenses
+
+If you have multiple saved receipt images or PDFs to upload, you can drag and drop them onto your Expenses page in batches of ten - this will start the SmartScan process for all of them.
+
+You can also create a number of future 'placeholder' expenses for your recurring expenses (such as recurring bills or subscriptions) which you don't have receipts for by clicking *New Expense > Create Multiple* to quickly add multiple expenses in batches of up to ten.
+
+# How to Edit Bulk Expenses
+Editing expenses in bulk will allow you to apply the same coding across multiple expenses and is a web-only feature. To bulk edit expenses:
+Go to the Expenses page.
+To narrow down your selection, use the filters (e.g. "Merchant" and "Draft") to find the specific expenses you want to edit.
+Select all the expenses you want to edit.
+Click on the **Edit Multiple** button at the top of the page. 
+# How to Edit Expenses on a Report
+If you’d like to edit expenses within a Draft report:
+
+1. Click on the Report containing all the expenses. 
+2. Click on **Details**.
+3. Click on the Pencil icon.
+3. Select the **Edit Multiple** button. 
+
+If you've already submitted your report, you'll need to Retract it or have it Unapproved first before you can edit the expenses.
+
+# FAQ
+
+## Does Expensify account for duplicates?
+
+Yes, Expensify will account for duplicates. Expensify works behind the scenes to identify duplicate expenses before they are submitted, warning employees when they exist. If a duplicate expense is submitted, the same warning will be shown to the approver responsible for reviewing the report. 
+
+If two expenses are SmartScanned on the same day for the same amount, they will be flagged as duplicates unless:
+The expenses were split from a single expense, 
+The expenses were imported from a credit card, or
+Matching email receipts sent to receipts@expensify.com were received with different timestamps. 
+
+## How do I resolve a duplicate expense?
+
+If Concierge has let you know it's flagged a receipt as a duplicate, scanning the receipt again will trigger the same duplicate flagging.Users have the ability to resolve duplicates by either deleting the duplicated transactions, merging them, or ignoring them (if they are legitimately separate expenses of the same date and amount). 
+
+## How do I recover a duplicate or undelete an expense?
+
+To recover a duplicate or undelete an expense: 
+Log into your Expensify account on the website and navigate to the Expenses page 
+Use the filters to search for deleted expenses by selecting the "Deleted" filter 
+Select the checkbox next to the expenses you want to restore 
+Click the **Undelete** button and you're all set. You’ll find the expense on your Expenses page again.
+
+# Deep Dive
+
+## What are the different Expense statuses?
+
+There are a number of different expense statuses in Expensify:
+1. **Personal**: Personal expenses are not yet part of a report (and therefore unsubmitted) and are not viewable by anyone but the expense creator/owner.
+2. **Draft**: Draft expenses are seen as still in progress, and are unsubmitted. Your Policy Admin will be able to view them, making this a collaborative step toward reimbursement.
+3. **Processing**: Processing expenses are submitted, but waiting for approval.
+4. **Approved**: If it's a non-reimbursable expense, the workflow is complete at this point. If it's a reimbursable expense, you're one step closer to getting paid.
+5. **Reimbursed**: Reimbursed expenses are fully settled. You can check the Report Comments to see when you'll get paid.
+6. **Closed**: Sometimes an expense accidentally ends up on your Individual Policy, falling into the Closed status. You’ll need to reopen the report and change the Policy by clicking on the **Details** tab in order to resubmit your report.
+
+## What are Violations?
+
+Violations represent errors or discrepancies that Expensify has picked up and need to be corrected before a report can be successfully submitted. The one exception is when an expense comment is added, it will override the violation - as the user is providing a valid reason for submission.
+
+To enable or configure violations according to your policy, go to **Settings > Policies > _Policy Name_ > Expenses > Expense Violations**. Keep in mind that Expensify includes certain system mandatory violations that can't be disabled, even if your policy has violations turned off.
+
+You can spot violations by the exclamation marks (!) attached to expenses. Hovering over the symbol will provide a brief description and you can find more detailed information below the list of expenses. The two types of violations are:
+1. **Red**: These indicate violations directly tied to your report's Policy settings. They are clear rule violations that must be addressed before submission.
+2. **Yellow**: Concierge will highlight items that require attention but may not necessarily need corrective action. For example, if a receipt was SmartScanned and then the amount was modified, we’ll bring it to your attention so that it can be manually reviewed.
+
+## How to Track Attendees
+
+Attendee tracking makes it easy to track shared expenses and maintain transparency in your group spending. 
+
+Internal attendees are considered users within your policies or domain. To add internal attendees on mobile or web:
+1. Click or tap the **Attendee** field within your expense.
+2. Select the internal attendees you'd like to add from the list of searchable users.
+3. You can continue adding more attendees or save the Expense.
+
+External attendees are considered users outside your group policy or domain. To add external attendees:
+1. Click or tap the **Attendee** field within your expense.
+2. Type in the individual's name or email address.
+3. Tap **Add** to include the attendee.
+4. You can continue adding more attendees or save the Expense.
+
+To remove an attendee from an expense:
+
+1. Open the expense.
+2. Click or tap the **Attendees** field to display the list of attendees.
+3. From the list, de-select the attendees you'd like to remove from the expense.
diff --git a/docs/articles/expensify-classic/get-paid-back/expenses/Merge-Expenses.md b/docs/articles/expensify-classic/get-paid-back/expenses/Merge-Expenses.md
new file mode 100644
index 000000000000..a8444b98c951
--- /dev/null
+++ b/docs/articles/expensify-classic/get-paid-back/expenses/Merge-Expenses.md
@@ -0,0 +1,65 @@
+---
+title: Merge Expenses
+description: This article shows you all the ways that you can merge your expenses in Expensify!
+---
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# About
+The merge expense function helps combine two separate expenses into one. This is useful when the same expense has been accidentally entered more than once, or if you have a connected credit card and an imported expense didn’t automatically merge with a manual entry. 
+
+# How-to merge expenses
+It’s important to note that merging expenses doesn't add the two values together. Instead, merging them combines both expenses to create a single, consolidated expense.
+
+Keep in mind: 
+1. Merging expenses cannot be undone.
+2. You can only merge two expenses at a time.
+3. You can merge a cash expense with a credit card expense, or two cash expenses - but not two credit card expenses.
+4. In order to merge, both expenses will need to be in a Personal or Draft status.
+
+# How to merge expenses on the web app
+To merge two expenses from the Expenses page:
+1. Sign into your Expensify account.
+2. Navigate to the Expenses page on the left-hand navigation.
+3. Click the checkboxes next to the two expenses you wish to merge.
+4. Click **Merge**.
+5. You'll be able to choose which aspect of each of the two expenses you would like to be used on the resulting expense, such as the receipt image, card, merchant, category, and more.  
+
+To merge two expenses from the Reports page:
+1. Sign into your Expensify account.
+2. Navigate to the Reports page on the left-hand navigation.
+3. Click the Report that contains the expenses that you wish to merge.
+4. Click on the **Details** tab, then the Pencil icon.
+5. Select the two expenses that you wish to merge.
+6. You'll be able to choose which aspect of each of the two expenses you would like to be used on the resulting expense, such as the receipt image, card, merchant, category, and more.   
+
+# How to merge expenses on the Expensify mobile app
+On the mobile app, merging is prompted when you see the message _"Potential duplicate expense detected"_. Simply tap **Resolve Now** to take a closer look, then hit **Merge Expense**, and you're done! 
+
+If the expenses exist on two different reports, you will be asked which report you'd like the newly created single expense to be reported onto.
+
+# FAQ
+
+## Can you merge expenses across different reports?
+
+You cannot merge expenses across different reports. Expenses will only merge if they are on the same report. If you have expenses across different reports that you wish to merge, you’ll need to move both expenses onto the same report (and ensure they are in the Draft status) in order to merge them.
+
+## Can you merge expenses across different accounts?
+
+You cannot merge expenses across two separate accounts. You will need to choose one submitter and transfer the expense information to that user's account in order to merge the expense.
+
+## Can you merge expenses with different currencies?
+
+Yes, you can merge expenses with different currencies. The conversion amount will be based on the daily exchange rate for the date of the transaction, as long as the converted rates are within +/- 5%. If the currencies are the same, then the amounts must be an exact match to merge.
+
+## Can Expensify automatically merge a cash expense with a credit card expense?
+
+Yes, Expensify can merge a cash expense with a credit card expense. A receipt will need to be SmartScanned via the app or forwarded to [receipts@expensify.com](mailto:receipts@expensify.com) in order to merge with a card expense. Note that the SmartScan must be fully completed and not stopped or edited, otherwise the two won’t merge. 
+
+## It doesn’t look like my cash and card expenses merged properly. What are some troubleshooting tips?
+First, check the expense types - you can only merge a SmartScanned receipt (which will initially show with a cash icon) with a card transaction imported from a bank or via CSV.  
+
+If the card expense in your Expensify account is older than the receipt you're trying to merge it with, they won't merge, and if the receipt is dated more than 7 days prior to the card expense, then they also will not merge.
+
+If you have any expenses that are more than 90 days old from the date they were incurred (not the date they were imported to Expensify), Expensify will not automatically merge them. This safeguard helps prevent the merging of very old expenses that might not align with recent transactions or receipts.
+
+Lastly, transactions imported with the Expensify API (via the Expense Importer) will not automatically merge with SmartScanned transactions.
diff --git a/docs/articles/expensify-classic/get-paid-back/expenses/Upload-Receipts.md b/docs/articles/expensify-classic/get-paid-back/expenses/Upload-Receipts.md
new file mode 100644
index 000000000000..29380dab5a5b
--- /dev/null
+++ b/docs/articles/expensify-classic/get-paid-back/expenses/Upload-Receipts.md
@@ -0,0 +1,36 @@
+---
+title: Upload-Receipts.md
+description: This article shows you all the ways that you can upload your receipts to Expensify!
+---
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# About
+Need to get paid? Check out this guide to see all the ways that you can upload your receipts to Expensify - whether it’s by SmartScanning them by forwarding via email or manually by taking a picture of a receipt, we’ll cover it here!
+
+# How-to Upload Receipts
+## SmartScan
+The easiest way to upload your receipts to Expensify is to SmartScan them with Expensify’s mobile app or forward a receipt from your email inbox! 
+
+When you SmartScan a receipt, we’ll read the Merchant, Date and Amount of the transaction, create an expense, and add it to your Expensify account automatically. The best practice is to take a picture of the receipt at the time of purchase or forward it to your Expensify account from the point of sale system. If you have a credit card connected and you upload a receipt that matches a card expense, the SmartScanned receipt will automatically merge with the imported card expense instead. 
+
+## Email Receipts
+To SmartScan a receipt on your mobile app, tap the green camera button, point and shoot! You can also forward your digital receipts (or photos of receipts) to receipts@expensify.com from the email address associated with your Expensify account, and they’ll be SmartScanned. This may take a few minutes because Expensify aims to have the most accurate OCR.
+
+## Manually Upload
+To upload receipts on the web, simply navigate to the Expenses page and click on **New Expense**. Select **Scan Receipt** and choose the file you would like to upload, or drag-and-drop your image directly into the Expenses page, and that will start the SmartScanning process!
+
+# FAQ
+## How do you SmartScan multiple receipts? 
+You can utilize the Rapid Fire Mode to quickly SmartScan multiple receipts at once! 
+
+To activate it, tap on the green camera button in the mobile app and then tap on the camera icon on the bottom right. When you see the little fire icon on the camera, Rapid Fire Mode has been activated - tap the camera icon again to disable Rapid Fire Mode.
+
+## How do you create an expense from an email address that is different from your Expensify login?
+You can email a receipt from a different email address by adding it as a Secondary Login to your Expensify account - this ensures that any receipts sent from this email to receipts@expensify.com will be associated with your current Expensify account.
+
+Once that email address has been added as a Secondary Login, simply forward your receipt image or emails to receipts@expensify.com.
+
+## How do you crop or rotate a receipt image?
+You can crop and rotate a receipt image on the web app, and you can only edit one expense at a time. 
+
+Navigate to your Expenses page and locate the expense whose receipt image you'd like to edit, then click the expense to open the Edit screen. If there is an image file associated with the receipt, you will see the Rotate and Crop buttons. Alternatively, you can also navigate to your Reports page, click on a report, and locate the individual expense.
diff --git a/docs/articles/expensify-classic/get-paid-back/reports/Create-A-Report.md b/docs/articles/expensify-classic/get-paid-back/reports/Create-A-Report.md
new file mode 100644
index 000000000000..ea808695e7cd
--- /dev/null
+++ b/docs/articles/expensify-classic/get-paid-back/reports/Create-A-Report.md
@@ -0,0 +1,166 @@
+---
+title: Create a Report
+description: Learn how to create and edit reports in Expensify
+---
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# Overview
+
+This article covers all the basics of creating, editing, deleting and managing your reports.
+
+# How to create a report
+
+_Using the web app:_
+
+To create a report on the Expensify website, click the New Report button on the **Reports** page.
+
+_Using the mobile app:_
+
+Tap the ☰ icon.
+Tap **Reports**.
+Tap the **+** icon.
+Choose your desired report type.
+
+# How to edit a report
+
+## Adding expenses to a report
+
+You can add expenses to the report by clicking **Add Expenses** at the top of the report. 
+
+## Removing expenses from a report on the Expensify web app
+
+To remove expenses from the report on the web app, click the red ❌ next to the expense.
+
+## Removing expenses from a report on the Expensify mobile app
+
+To remove an expense on an Android device, hold the expense and tap **Delete**. 
+
+To remove an expense on an iOS device, swipe the expense to the left and tap **Delete**. 
+
+## Editing the report title
+
+To edit the report title, click the pencil icon next to the name. To save your changes, tap the enter key on your keyboard. 
+
+**Note:** You may be unable to edit your reports' titles based on the  settings. 
+
+## Bulk-editing expenses on a report
+
+Click Details in the top-right of the report on the web app, then click the pencil icon to bring up the editing modal. You can click the pencil icon to the left of an expense to edit it, or you can edit multiple expenses at once by ticking the checkbox of the expenses you’d like to bulk-edit and then clicking **Edit Multiple** at the top of the modal.  
+
+## Commenting on the report
+
+You can comment on the report by adding your comment to the **Report Comments** section at the bottom. Expensify will also log report actions here. 
+
+## Attachments
+
+If you’d like to attach a photo or document to the report, follow the instructions below to add the attachment to your report comment section. 
+
+_Using the web app:_
+
+1. Click the **Paperclip** icon in the comment box of the **Report Comments** section.
+2. Select the file to attach.
+3. Check the preview of the attachment and click Upload.
+
+_Using the mobile app:_
+
+1. Tap into the report.
+2. Scroll to the bottom of the report and tap the paper clip icon to attach a file.
+
+**Note:** Report comments support jpeg, jpg, png, gif, csv, and pdf files.
+
+## Changing the report's workspace
+
+To change the report's workspace, click **Details** in the top-right of the report on the web app, then select the correct workspace from the **Workspace** drop-down. 
+
+## Changing the report type (Expense Report/Invoice)
+
+To change the report type, click **Details** in the top-right of the report on the web app, then select the correct report type from the **Type** drop-down. 
+
+## Changing the layout of the report
+
+There are three ways you can change the report layout under the Details section of the report. To do this, select the desired layout from the relevant drop-down menu:
+
+ - **View** - Choose between a Basic or Detailed report view. 
+ - **Group By** - Choose to group expenses on the report based on their Category or Tag. 
+ - **Split By** -  Split out the expenses based on their Reimbursable or Billable status. 
+
+# How to submit a report
+
+1. Click **Submit** in the top-left of the report (or **Submit Report** at the top in the mobile app).
+2. Verify the approver and click **Submit** again.
+
+# How to retract your report (Undo Submit)
+
+As long as the report is still in a Processing state, you can retract this submission to put the report back to Draft status to make corrections and re-submit. 
+
+To retract a **Processing** report on the web app, click the Undo Submit button at the upper left-hand corner of the report. 
+
+To complete this from the mobile app, simply open the report from within your app and click the **Retract** button at the top of the report. 
+
+# How to share a report
+
+Click Details in the top-right of the report on the web app to bring up the sharing settings. The following options are available:
+
+ - Click the **Printer** icon to print the report. 
+ - Click the **Download** icon to download a PDF of the report
+ - Click the **Share** icon to share the report via email or SMS.  
+
+# How to close a report
+
+You can close your report if you don't need it approved by your employer.
+
+_To close a report on the Expensify website:_
+
+1. Navigate to the report in question. 
+2. Click **Mark as Closed** at the top of the report.
+3. You can re-open a report once it’s closed by clicking **Undo Close** at the top of the report. 
+
+# How to delete a report
+
+_Deleting a report on the web app:_
+
+Click Details in the top-right of the report on the web app, then click the Trash icon to delete the report. Any expenses on the report will move to an Unreported state. 
+
+_Deleting a report on the mobile app:_
+
+To delete a Draft report on an Android, press and hold the report name and tap **Delete**. 
+
+To delete a Draft report on an iOS device, go to the **Reports** screen, swipe the report to the left, and tap **Delete**. 
+
+_Deleting a report in the Processing, Approved, Reimbursed or Closed state:_
+
+If you want to delete a Processing or Closed report, please follow the How to undo your report submission instructions in this article to move the report back into an Draft status, then follow the steps above. 
+
+If you want to delete an Approved or Reimbursed report, please speak to your Company Admin as this may not be possible.
+
+# How to move expenses between reports
+
+Navigate to your Expenses page.
+Tick the checkbox next to each expense you'd like to move.
+Click the Add To Report button in the top right corner.
+Select your desired report from the drop-down.
+
+# How to use Guided Review to clean up your report
+
+Open your report on the web app and click Review at the top. The system will walk you through each violation on the report.
+As you go through each violation, click View to look at the expense in more detail or resolve any violations.
+Click Next to move on to the next item.
+Click Finish to complete the review process when you’re done.
+
+# FAQ
+
+## Is there a difference between Expense Reports, Bills, and Invoices?
+
+**Expense Reports** are submitted by an employee to their employer. They contain either personally incurred expenses that the employee should be reimbursed for, or non-reimbursable expenses (such as company card expenses) incurred by the employee that require tracking for accounting purposes.
+
+**Invoices** are reports that a business or contractor will send to another business to charge them for goods or services the business received. Each invoice will have a matching **Bill** owned by the recipient so they may use it to pay the invoice sender.
+
+## Which report type should I use?
+
+If you bought something on a company card or need to be reimbursed by your employer, you’ll need an **Expense Report**. 
+
+If someone external to the business sends you an invoice for their services, you’ll want a **Bill** (or even better - use our Bill Pay process)
+
+## When should I submit my report?
+
+Your Company Admin can answer this one, and they may have configured the workspace’s [Scheduled Submit] setting to enforce a regular cadence for you. If not, you can still set this up under your [Individual workspace].
diff --git a/docs/articles/expensify-classic/get-paid-back/reports/Reimbursements.md b/docs/articles/expensify-classic/get-paid-back/reports/Reimbursements.md
new file mode 100644
index 000000000000..a31c0a582fd7
--- /dev/null
+++ b/docs/articles/expensify-classic/get-paid-back/reports/Reimbursements.md
@@ -0,0 +1,42 @@
+# Overview
+
+If you want to know more about how and when you’ll be reimbursed through Expensify, we’ve answered your questions below. 
+
+# How to Get Reimbursed 
+
+To get paid back after submitting a report for reimbursement, you’ll want to be sure to connect your bank account. You can do that under **Settings** > **Account** > **Payments** > **Add a Deposit Account**. Once your employer has approved your report, the reimbursement will be paid into the account you added.
+
+# Deep Dive
+
+## Reimbursement Timing 
+
+### US Bank Accounts
+
+If your company uses Expensify's ACH reimbursement we'll first check to see if the report is eligible for Rapid Reimbursement (next business day). For a report to be eligible for Rapid Reimbursement it must fall under two limits:
+
+ - $100 per deposit bank account per day or less for the individuals being reimbursed or businesses receiving payments for bills.
+ - Less than $10,000 being disbursed in a 24-hour time period from the verified bank account being used to pay the reimbursement.
+
+If the request passes both checks, then you can expect to see funds deposited into your bank account on the next business day.
+
+If either limit has been reached, then you can expect to see funds deposited within your bank account within the typical ACH timeframe of 3-5 business days.
+
+### International Bank Accounts
+
+If receiving reimbursement to an international deposit account via Global Reimbursement, you should expect to see funds deposited in your bank account within 4 business days.
+
+## Bank Processing Timeframes
+
+Banks only process transactions and ACH activity on weekdays that are not bank holidays. These are considered business days. Additionally, the business day on which a transaction will be processed depends upon whether or not a request is created before or after the cutoff time, which is typically 3 pm PST.
+For example, if your reimbursement is initiated at 4 pm on Wednesday, this is past the bank's cutoff time,  and it will not begin processing until the next business day.
+If that same reimbursement starts processing on Thursday, and it's estimated to take 3-5 business days, this will cover a weekend, and both days are not considered business days. So, assuming there are no bank holidays added into this mix, here is how that reimbursement timeline would play out:
+
+**Wednesday**: Reimbursement initiated after 3 pm PST; will be processed the next business day by your company’s bank.
+**Thursday**: Your company's bank will begin processing the withdrawal request
+**Friday**: Business day 1
+**Saturday**: Weekend
+**Sunday**: Weekend
+**Monday**: Business day 2
+**Tuesday**: Business day 3
+**Wednesday**: Business day 4
+**Thursday**: Business day 5
diff --git a/docs/articles/expensify-classic/getting-started/Best-Practices.md b/docs/articles/expensify-classic/getting-started/Best-Practices.md
new file mode 100644
index 000000000000..b02ea9d68fe6
--- /dev/null
+++ b/docs/articles/expensify-classic/getting-started/Best-Practices.md
@@ -0,0 +1,5 @@
+---
+title: Best Practices
+description: Best Practices
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/getting-started/Employees.md b/docs/articles/expensify-classic/getting-started/Employees.md
new file mode 100644
index 000000000000..6d3c2dc705e1
--- /dev/null
+++ b/docs/articles/expensify-classic/getting-started/Employees.md
@@ -0,0 +1,5 @@
+---
+title: Employees
+description: Employees
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/getting-started/Individual-Users.md b/docs/articles/expensify-classic/getting-started/Individual-Users.md
new file mode 100644
index 000000000000..de7a527df010
--- /dev/null
+++ b/docs/articles/expensify-classic/getting-started/Individual-Users.md
@@ -0,0 +1,5 @@
+---
+title: Individual Users
+description: Individual Users
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/getting-started/Invite-Employees.md b/docs/articles/expensify-classic/getting-started/Invite-Employees.md
new file mode 100644
index 000000000000..73dc7b8274f0
--- /dev/null
+++ b/docs/articles/expensify-classic/getting-started/Invite-Employees.md
@@ -0,0 +1,5 @@
+---
+title: Invite Employees
+description: Invite Employees
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/getting-started/Mobile-App.md b/docs/articles/expensify-classic/getting-started/Mobile-App.md
new file mode 100644
index 000000000000..7fa57abbdf61
--- /dev/null
+++ b/docs/articles/expensify-classic/getting-started/Mobile-App.md
@@ -0,0 +1,5 @@
+---
+title: Using the App
+description: Using the App
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/getting-started/Plan-Types.md b/docs/articles/expensify-classic/getting-started/Plan-Types.md
new file mode 100644
index 000000000000..f0323947ee12
--- /dev/null
+++ b/docs/articles/expensify-classic/getting-started/Plan-Types.md
@@ -0,0 +1,5 @@
+---
+title: Plan-Types
+description: Plan-Types
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/getting-started/Policy-Admins.md b/docs/articles/expensify-classic/getting-started/Policy-Admins.md
new file mode 100644
index 000000000000..484350f101a5
--- /dev/null
+++ b/docs/articles/expensify-classic/getting-started/Policy-Admins.md
@@ -0,0 +1,5 @@
+---
+title: Policy Admins
+description: Policy Admins
+---
+## Resource Coming Soon!
diff --git a/docs/articles/other/Referral-Program.md b/docs/articles/expensify-classic/getting-started/Referral-Program.md
similarity index 98%
rename from docs/articles/other/Referral-Program.md
rename to docs/articles/expensify-classic/getting-started/Referral-Program.md
index 1faff1c9ec4f..683e93d0277a 100644
--- a/docs/articles/other/Referral-Program.md
+++ b/docs/articles/expensify-classic/getting-started/Referral-Program.md
@@ -50,4 +50,4 @@ Please send a message to concierge@expensify.com with the billing owner of the c
 
 Expensify members who are opted-in for our newsletters will have received an email containing their unique referral link. 
 
-On the mobile app, go to **Settings** > **Invite a Friend** > **Share Invite Link** to retrieve your referral link.  
+On the mobile app, go to **Settings** > **Invite a Friend** > **Share Invite Link** to retrieve your referral link.
diff --git a/docs/articles/expensify-classic/getting-started/Security.md b/docs/articles/expensify-classic/getting-started/Security.md
new file mode 100644
index 000000000000..5a0036e3e161
--- /dev/null
+++ b/docs/articles/expensify-classic/getting-started/Security.md
@@ -0,0 +1,5 @@
+---
+title: Security
+description: Security
+---
+## Resource Coming Soon!
diff --git a/docs/articles/other/Card-Rev-Share-for-Approved-Partners.md b/docs/articles/expensify-classic/getting-started/approved-accountants/Card-Revenue-Share-For-Expensify-Approved-Partners.md
similarity index 99%
rename from docs/articles/other/Card-Rev-Share-for-Approved-Partners.md
rename to docs/articles/expensify-classic/getting-started/approved-accountants/Card-Revenue-Share-For-Expensify-Approved-Partners.md
index 44614d506d49..b18531d43200 100644
--- a/docs/articles/other/Card-Rev-Share-for-Approved-Partners.md
+++ b/docs/articles/expensify-classic/getting-started/approved-accountants/Card-Revenue-Share-For-Expensify-Approved-Partners.md
@@ -13,4 +13,4 @@ To benefit from this program, all you need to do is ensure that you are listed a
 - What if my firm is not permitted to accept revenue share from our clients? <br>
 <br>We understand that different firms may have different policies. If your firm is unable to accept this revenue share, you can pass the revenue share back to your client to give them an additional 0.5% of cash back using your own internal payment tools.<br><br>
 - What if my firm does not wish to participate in the program? <br>
-<br>Please reach out to your assigned partner manager at new.expensify.com to inform them you would not like to accept the revenue share nor do you want to pass the revenue share to your clients. 
+<br>Please reach out to your assigned partner manager at new.expensify.com to inform them you would not like to accept the revenue share nor do you want to pass the revenue share to your clients. 
\ No newline at end of file
diff --git a/docs/articles/other/Your-Expensify-Partner-Manager.md b/docs/articles/expensify-classic/getting-started/approved-accountants/Your-Expensify-Partner-Manager.md
similarity index 99%
rename from docs/articles/other/Your-Expensify-Partner-Manager.md
rename to docs/articles/expensify-classic/getting-started/approved-accountants/Your-Expensify-Partner-Manager.md
index 9a68fbfd8b39..c7a5dc5a04ab 100644
--- a/docs/articles/other/Your-Expensify-Partner-Manager.md
+++ b/docs/articles/expensify-classic/getting-started/approved-accountants/Your-Expensify-Partner-Manager.md
@@ -31,4 +31,4 @@ If you’re unable to contact your Partner Manager (i.e., they're out of office
 ## Can I get on a call with my Partner Manager?
 Of course! You can ask your Partner Manager to schedule a call whenever you think one might be helpful. Partner Managers can discuss client onboarding strategies, firm wide training, and client setups.
 
-We recommend continuing to work with Concierge for **general support questions**, as this team is always online and available to help immediately. 
+We recommend continuing to work with Concierge for **general support questions**, as this team is always online and available to help immediately. 
\ No newline at end of file
diff --git a/docs/articles/playbooks/Expensify-Playbook-for-Small-to-Medium-Sized-Businesses.md b/docs/articles/expensify-classic/getting-started/playbooks/Expensify-Playbook-For-Small-To-Medium-Sized-Businesses.md
similarity index 99%
rename from docs/articles/playbooks/Expensify-Playbook-for-Small-to-Medium-Sized-Businesses.md
rename to docs/articles/expensify-classic/getting-started/playbooks/Expensify-Playbook-For-Small-To-Medium-Sized-Businesses.md
index a4004dbe1b88..2b95a1d13fde 100644
--- a/docs/articles/playbooks/Expensify-Playbook-for-Small-to-Medium-Sized-Businesses.md
+++ b/docs/articles/expensify-classic/getting-started/playbooks/Expensify-Playbook-For-Small-To-Medium-Sized-Businesses.md
@@ -280,4 +280,4 @@ Now that we’ve gone through all of the steps for setting up your account, let
 4. Click *Accept Terms*
 
 ## You’re all set!
-Congrats, you are all set up! If you need any assistance with anything mentioned above or would like to understand other features available in Expensify, reach out to your Setup Specialist directly in *[new.expensify.com](https://new.expensify.com)*. Don’t have one yet? Create a Control Policy, and we’ll automatically assign a dedicated Setup Specialist to you. 
+Congrats, you are all set up! If you need any assistance with anything mentioned above or would like to understand other features available in Expensify, reach out to your Setup Specialist directly in *[new.expensify.com](https://new.expensify.com)*. Don’t have one yet? Create a Control Policy, and we’ll automatically assign a dedicated Setup Specialist to you.
diff --git a/docs/articles/playbooks/Expensify-Playbook-for-US-Based-Bootstrapped-Startups.md b/docs/articles/expensify-classic/getting-started/playbooks/Expensify-Playbook-For-US-Based-Bootstrapped-Startups.md
similarity index 99%
rename from docs/articles/playbooks/Expensify-Playbook-for-US-Based-Bootstrapped-Startups.md
rename to docs/articles/expensify-classic/getting-started/playbooks/Expensify-Playbook-For-US-Based-Bootstrapped-Startups.md
index 089ad16834ac..86c6a583c758 100644
--- a/docs/articles/playbooks/Expensify-Playbook-for-US-Based-Bootstrapped-Startups.md
+++ b/docs/articles/expensify-classic/getting-started/playbooks/Expensify-Playbook-For-US-Based-Bootstrapped-Startups.md
@@ -88,4 +88,3 @@ When you have bills to pay you can click *View all bills* under the *Manage your
 
 # You’re all set!
 Congrats, you are all set up! If you need any assistance with anything mentioned above, reach out to either your Concierge directly in *[new.expensify.com](https://new.expensify.com/concierge)*, or email concierge@expensify.com. Create a Collect or Control Policy, and we’ll automatically assign a dedicated Setup Specialist to you.
-
diff --git a/docs/articles/playbooks/Expensify-Playbook-for-US-based-VC-Backed-Startups.md b/docs/articles/expensify-classic/getting-started/playbooks/Expensify-Playbook-For-US-Based-VC-Backed-Startups.md
similarity index 100%
rename from docs/articles/playbooks/Expensify-Playbook-for-US-based-VC-Backed-Startups.md
rename to docs/articles/expensify-classic/getting-started/playbooks/Expensify-Playbook-For-US-Based-VC-Backed-Startups.md
diff --git a/docs/articles/other/Your-Expensify-Account-Manager.md b/docs/articles/expensify-classic/getting-started/support/Your-Expensify-Account-Manager.md
similarity index 99%
rename from docs/articles/other/Your-Expensify-Account-Manager.md
rename to docs/articles/expensify-classic/getting-started/support/Your-Expensify-Account-Manager.md
index 70e0435e00e1..3ef47337a74c 100644
--- a/docs/articles/other/Your-Expensify-Account-Manager.md
+++ b/docs/articles/expensify-classic/getting-started/support/Your-Expensify-Account-Manager.md
@@ -33,4 +33,4 @@ You will be able to see if they are online via their status, which will either s
 If for some reason, you’re unable to reach your account manager, perhaps because they’re offline, then you can always reach out to Concierge for assistance. Your account manager will always get back to you when they’re online again.
 
 ## Can I get on a call with my account manager?
-Of course! You can ask your account manager to schedule a call whenever you think one might be helpful. We usually find that the most effective calls are those that deal with general setup questions. For technical troubleshooting, we typically recommend chat as that allows your account manager time to look into the issue, test things on their end, and, if needed, consult the wider Expensify technical team. It also allows you to easily refer back to instructions and links.
+Of course! You can ask your account manager to schedule a call whenever you think one might be helpful. We usually find that the most effective calls are those that deal with general setup questions. For technical troubleshooting, we typically recommend chat as that allows your account manager time to look into the issue, test things on their end, and, if needed, consult the wider Expensify technical team. It also allows you to easily refer back to instructions and links.
\ No newline at end of file
diff --git a/docs/articles/other/Enable-Location-Access-on-Web.md b/docs/articles/expensify-classic/getting-started/tips-and-tricks/Enable-Location-Access-On-Web.md
similarity index 99%
rename from docs/articles/other/Enable-Location-Access-on-Web.md
rename to docs/articles/expensify-classic/getting-started/tips-and-tricks/Enable-Location-Access-On-Web.md
index 6cc0d19e4cde..649212b00f7b 100644
--- a/docs/articles/other/Enable-Location-Access-on-Web.md
+++ b/docs/articles/expensify-classic/getting-started/tips-and-tricks/Enable-Location-Access-On-Web.md
@@ -52,4 +52,4 @@ Ask: The site must ask if it can use your location.
 Deny: The site can’t use your location.
 Allow: The site can always use your location.
 
-[Safari help page](https://support.apple.com/guide/safari/websites-ibrwe2159f50/mac)
+[Safari help page](https://support.apple.com/guide/safari/websites-ibrwe2159f50/mac)
\ No newline at end of file
diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/ADP.md b/docs/articles/expensify-classic/integrations/HR-integrations/ADP.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/HR-integrations/ADP.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/Greenhouse.md b/docs/articles/expensify-classic/integrations/HR-integrations/Greenhouse.md
new file mode 100644
index 000000000000..b44e5a090d17
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/HR-integrations/Greenhouse.md
@@ -0,0 +1,43 @@
+---
+title: Greenhouse Integration
+description: Automatically send candidates from Greenhouse to Expensify for easy reimbursement
+---
+
+# Overview
+Expensify's direct integration with Greenhouse allows you to automatically send candidates from Greenhouse to Expensify for easy reimbursement. The integration can set the candidate's recruiter or recruiting coordinator as approver in Expensify.
+
+## Prerequisites of the integration
+- You must be a Workspace Admin in Expensify and an Admin in Greenhouse with Developer Permissions to complete this connection. This can be the same person or two different people.
+- Each Greenhouse candidate record must have an email address in order to send to Expensify since we use this as the unique identifier in Expensify.
+- We highly recommend that you create a specific Expensify workspace for candidates so that you can set up a separate workflow and a different set of Categories and Tags from what your employees would see.
+
+# How to connect Greenhouse to Expensify
+## Establish the connection from Expensify
+
+1. Log into Expensify as a Workspace admin and navigate to **Settings > Workspaces > _[Workspace Name]_ > Connections**
+2. Under Greenhouse, click **Connect to Greenhouse** then click **Sync with Greenhouse**, which will open the "Greenhouse Integration" instructions page in a new browser window
+
+## Create the Web hook
+
+1. Click the link under Step 1 on the Greenhouse Integration instructions page, or log into your Greenhouse account and navigate to **Configure > Dev Center > Web Hooks > Web Hooks**.
+2. After landing on the "Create a New Web Hook" page, follow the steps on the Greenhouse Integration instructions page to create the web hook.
+
+## Create the custom candidate field
+
+1. Click the link under Step 2 on the Greenhouse Integration instructions page, or log into your Greenhouse account and navigate to **Configure > Custom Options > Custom Company Fields > Candidates**
+2. Follow the steps on the Greenhouse Integration instructions page to create the custom Candidate field.
+3. Click **Finish** (Step 3 on the Greenhouse Integration instructions page) to finish connecting Greenhouse with Expensify.
+
+# How to send candidates from Greenhouse to Expensify
+## In Greenhouse:
+
+1. Log into Greenhouse and go to any candidate’s Details tab
+2. Confirm that the Email field is filled in
+3. Optionally select the Recruiter field to set the recruiter as the candidate's expense approver in Expensify (Note: if you'd prefer to have the Recruiting Coordinator used as the default approver, please reach out to concierge@expensify.com or your account manager to request that we change the default approver on your behalf)
+4. Send this candidate to Expensify by toggling the **Invite to Expensify** field to **Yes** and clicking **Save**
+
+## In Expensify:
+
+1. Navigate to **Settings > Policies > Group > _[Workspace Name]_ > Members**
+2. The candidate you just sent to Expensify should be listed in the workspace members list
+3. If the Recruiter (or Recruiting Coordinator) field was filled in in Greenhouse, the candidate will already be configured to submit reports to that recruiter for approval. If no Recruiter was selected, then the candidate will submit based on the Expensify workspace approval settings.
diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/Gusto.md b/docs/articles/expensify-classic/integrations/HR-integrations/Gusto.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/HR-integrations/Gusto.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/QuickBooks-Time.md b/docs/articles/expensify-classic/integrations/HR-integrations/QuickBooks-Time.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/HR-integrations/QuickBooks-Time.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/Rippling.md b/docs/articles/expensify-classic/integrations/HR-integrations/Rippling.md
new file mode 100644
index 000000000000..fa4aaec3376f
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/HR-integrations/Rippling.md
@@ -0,0 +1,13 @@
+---
+title: Rippling Integration
+description: Sync employee and expense data between Expensify and Rippling
+---
+# Overview
+The Rippling integration allows mutual customers to sync employee and expense data between Expensify and Rippling. The Rippling integration allows you to:
+1. **Automate Employee Management:** Automatically create and remove employee accounts in Expensify directly from Rippling.
+2. **Simplify Employee Access to Expensify:** Employees can sign into Expensify from their Rippling SSO bar using SAML single sign-on.
+3. **Import Reimbursable Expense Reports:** Admins can export reimbursable expense reports from Expensify directly into Rippling Payroll.
+
+# How to use the Rippling integration
+The Rippling team manages this integration. To connect your Expensify workspace with Rippling, please visit the Rippling App Shop and sign into your Rippling account.
+For instructions on how to connect, and for troubleshooting the integration, please contact the Rippling support team by emailing support@rippling.com.
diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/Workday.md b/docs/articles/expensify-classic/integrations/HR-integrations/Workday.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/HR-integrations/Workday.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/Zenefits.md b/docs/articles/expensify-classic/integrations/HR-integrations/Zenefits.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/HR-integrations/Zenefits.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/accounting-integrations/FinancalForce.md b/docs/articles/expensify-classic/integrations/accounting-integrations/FinancalForce.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/accounting-integrations/FinancalForce.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/accounting-integrations/NetSuite.md b/docs/articles/expensify-classic/integrations/accounting-integrations/NetSuite.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/accounting-integrations/NetSuite.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/accounting-integrations/QuickBooks-Desktop.md b/docs/articles/expensify-classic/integrations/accounting-integrations/QuickBooks-Desktop.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/accounting-integrations/QuickBooks-Desktop.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/accounting-integrations/QuickBooks-Online.md b/docs/articles/expensify-classic/integrations/accounting-integrations/QuickBooks-Online.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/accounting-integrations/QuickBooks-Online.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/accounting-integrations/Sage-Intacct.md b/docs/articles/expensify-classic/integrations/accounting-integrations/Sage-Intacct.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/accounting-integrations/Sage-Intacct.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/accounting-integrations/Xero.md b/docs/articles/expensify-classic/integrations/accounting-integrations/Xero.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/accounting-integrations/Xero.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/other-integrations/Google-Apps-SSO.md b/docs/articles/expensify-classic/integrations/other-integrations/Google-Apps-SSO.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/other-integrations/Google-Apps-SSO.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/Bolt.md b/docs/articles/expensify-classic/integrations/travel-integrations/Bolt.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/travel-integrations/Bolt.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/Egencia.md b/docs/articles/expensify-classic/integrations/travel-integrations/Egencia.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/travel-integrations/Egencia.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/Global-VaTax.md b/docs/articles/expensify-classic/integrations/travel-integrations/Global-VaTax.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/travel-integrations/Global-VaTax.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/Grab.md b/docs/articles/expensify-classic/integrations/travel-integrations/Grab.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/travel-integrations/Grab.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/Hotel-Tonight.md b/docs/articles/expensify-classic/integrations/travel-integrations/Hotel-Tonight.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/travel-integrations/Hotel-Tonight.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/Kayak.md b/docs/articles/expensify-classic/integrations/travel-integrations/Kayak.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/travel-integrations/Kayak.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/Lyft.md b/docs/articles/expensify-classic/integrations/travel-integrations/Lyft.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/travel-integrations/Lyft.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/TrainLine.md b/docs/articles/expensify-classic/integrations/travel-integrations/TrainLine.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/travel-integrations/TrainLine.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/TravelPerk.md b/docs/articles/expensify-classic/integrations/travel-integrations/TravelPerk.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/travel-integrations/TravelPerk.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/Trip-Actions.md b/docs/articles/expensify-classic/integrations/travel-integrations/Trip-Actions.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/travel-integrations/Trip-Actions.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/TripCatcher.md b/docs/articles/expensify-classic/integrations/travel-integrations/TripCatcher.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/travel-integrations/TripCatcher.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/Uber.md b/docs/articles/expensify-classic/integrations/travel-integrations/Uber.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/integrations/travel-integrations/Uber.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/manage-employees-and-report-approvals/Adding-Users.md b/docs/articles/expensify-classic/manage-employees-and-report-approvals/Adding-Users.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/manage-employees-and-report-approvals/Adding-Users.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/manage-employees-and-report-approvals/Approval-Workflows.md b/docs/articles/expensify-classic/manage-employees-and-report-approvals/Approval-Workflows.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/manage-employees-and-report-approvals/Approval-Workflows.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/manage-employees-and-report-approvals/Approving-Reports.md b/docs/articles/expensify-classic/manage-employees-and-report-approvals/Approving-Reports.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/manage-employees-and-report-approvals/Approving-Reports.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/manage-employees-and-report-approvals/User-Roles.md b/docs/articles/expensify-classic/manage-employees-and-report-approvals/User-Roles.md
new file mode 100644
index 000000000000..65238457f1a9
--- /dev/null
+++ b/docs/articles/expensify-classic/manage-employees-and-report-approvals/User-Roles.md
@@ -0,0 +1,63 @@
+---
+title: User Roles
+description: Each member has a role that defines what they can see and do in the workspace. 
+---
+
+# Overview
+
+This guide is for those who are part of a **Group Workspace**.
+
+Each member has a role that defines what they can see and do in the workspace. Most members will have the role of "Employee."
+
+# How to manage user roles
+
+To find and edit the roles of group workspace members, go to **Settings > Workspaces > Group > _[Workspace Name]_ > Members > Workspace Members**
+
+Here you'll see the list of members in your group workspace. To change their roles, click **Settings** next to the member’s name and choose the role that the member needs.
+
+Next, let’s go over the various user roles that are available on a group workspace.
+
+### The Employee Role
+
+- **What can they do:** Employees can only see their own expense reports or reports that have been submitted to or shared with them. They can't change settings or invite new users.
+- **Who is it for:** Regular employees who only need to manage their own expenses, or managers who are reviewing expense reports for a few users but don’t need global visibility. 
+- **Approvers:** Members who approve expenses can either be Employees, Admins, or Workspace Auditors, depending on how much control they need.
+- **Billable:** Employees are billable actors if they take actions on a report on your Group Workspace (including **SmartScanning** a receipt).
+
+### Workspace Admin Role
+
+- **What can they do:** Admins have full control. They can change settings, invite members, and view all reports. They can also process reimbursements if they have access to the company’s account.
+- **Billing Owners:** Billing owners are Admins by default. **Workspace Admins** are assigned by the owner or another admin.
+- **Billable:** Yes, if they perform actions like changing settings or inviting users. Just viewing reports is not billable.
+
+### Workspace Auditor Role
+
+- **What can they do:** Workspace Auditors can see all reports, make comments, and export them. They can also mark reports as reimbursed if they're the final approver.
+- **Who is it for:** Accountants, bookkeepers, and internal or external audit agents who need to view but not edit workspace settings.
+- **Billable:** Yes, if they perform any actions like commenting or exporting a report. Viewing alone doesn't incur a charge.
+
+### Technical Contact
+
+- **What can they do:** In case of connection issues, alerts go to the billing owner by default. You can set a technical contact if you want alerts to go to an IT administrator instead.
+- **How to set one:** Go to **Settings > Workspaces > Group > [Workspace Name] > Connections > Technical Contact**.
+- **Billable:** The technical contact doesn’t need to be a group workspace member and so is not counted towards your billable activity.
+
+Note: running expense analytics from **Insights** follows the same rules. All the reports and data graphs you generate will be created based on the expense data you have access to.
+
+# Deep Dive
+
+## Expense Data Visibility
+
+The amount of expense data you can see depends on your role within any group workspaces you're part of:
+
+- **Employees:** Whether you're on a free or paid plan, if you're not approving expenses, you'll only see your own expenses.
+- **Approvers:** If you approve expenses for your team and also submit your own, you can view both individual and team-wide expenses and analytics.
+- **Admins:** Users with an admin role can see analytics and data for every expense report made by anyone on the workspace.
+
+If you need to see more data, here are some options:
+
+- **Become an Admin:** Check within your organization if you can be upgraded to an admin role in your group workspaces.
+- **Become a Copilot:** Ask to be added as a **Copilot** to an existing admin account, which will allow you some additional viewing privileges.
+- **Become an Approver:** You could also be added as an **Approver** in an existing workflow to view more data.
+
+
diff --git a/docs/articles/expensify-classic/manage-employees-and-report-approvals/Vacation-Delegate.md b/docs/articles/expensify-classic/manage-employees-and-report-approvals/Vacation-Delegate.md
new file mode 100644
index 000000000000..7c21b12a83e1
--- /dev/null
+++ b/docs/articles/expensify-classic/manage-employees-and-report-approvals/Vacation-Delegate.md
@@ -0,0 +1,54 @@
+---
+title: Vacation Delegate
+description: In Expensify, a vacation delegate is someone you choose to act on your behalf when you're on vacation or taking personal time off. 
+---
+
+# Overview
+
+A delegate is someone who can handle approving expense reports for you, which is especially useful when you're out of the office!
+
+In Expensify, a **Vacation Delegate** is someone you choose to act on your behalf when you're on vacation or taking personal time off. They will approve expense reports just like you would, and everything moves forward as usual afterward.
+
+The system keeps a detailed audit trail, showing exactly when your delegate stepped in to approve a report for you. And if your delegate also goes on vacation, they can have their own delegate, so reports keep getting approved.
+
+By using this feature, you ensure that all reports get the approvals they need, even when you're not around.
+
+# How to use Vacation Delegate
+
+If you're planning to take some time off, you can use the **Vacation Delegate** feature to assign someone to approve expense reports for you. The reports will continue on their usual path as if you had approved them yourself.
+
+## Set a Vacation Delegate for yourself
+
+1. Go to the Expensify website (note: you can't do this from the mobile app).
+2. Navigate to **Settings > Your Account > Account Details** and scroll down to find **Vacation Delegate**.
+3. Enter the email address of the person you're designating as your delegate and click **Set Delegate**.
+
+Voila! You've set a vacation delegate. Any reports that usually come to you will now go to your delegate instead. When you return, you can easily remove the delegate by clicking a link at the top of the Expensify homepage.
+
+## Setting a Vacation Delegate as a Domain Admin
+
+1. Head to **Settings > Domains > [Your Domain Name] > Domain Members > Edit Settings**
+2. Enter the delegate's email address and click **Save.**
+
+Your delegate's actions will be noted in the history and comments of each report they approve, so you can keep track of what happened while you were away.
+
+# Deep Dive 
+
+## An audit trail of delegate actions
+
+The system records every action your vacation delegate takes on your behalf in the **Report History and Comments**. So, you can see when they approved an expense report for you. 
+
+# FAQs
+
+## Why can't my Vacation Delegate reimburse reports that they approve? 
+
+If your **Vacation Delegate** also needs to reimburse reports on your behalf whilst you're away, they'll also need access to the reimbursement account.
+
+If they do not have access to the reimbursement account used on your workspace, they won’t have the option to reimburse reports, even as your **Vacation Delegate**. 
+
+## What if my Vacation Delegate is also on vacation?
+
+Don't worry, your delegate can also pick their own **Vacation Delegate**. This way, expense reports continue to get approved even if multiple people are away.
+
+
+
diff --git a/docs/articles/expensify-classic/policy-and-domain-settings/Categories.md b/docs/articles/expensify-classic/policy-and-domain-settings/Categories.md
new file mode 100644
index 000000000000..0db022f400d3
--- /dev/null
+++ b/docs/articles/expensify-classic/policy-and-domain-settings/Categories.md
@@ -0,0 +1,5 @@
+---
+title: Categories
+description: Categories
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/policy-and-domain-settings/Domains-Overview.md b/docs/articles/expensify-classic/policy-and-domain-settings/Domains-Overview.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/policy-and-domain-settings/Domains-Overview.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/policy-and-domain-settings/Expenses.md b/docs/articles/expensify-classic/policy-and-domain-settings/Expenses.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/policy-and-domain-settings/Expenses.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/policy-and-domain-settings/Invoicing.md b/docs/articles/expensify-classic/policy-and-domain-settings/Invoicing.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/policy-and-domain-settings/Invoicing.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/policy-and-domain-settings/Per-Diem.md b/docs/articles/expensify-classic/policy-and-domain-settings/Per-Diem.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/policy-and-domain-settings/Per-Diem.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/policy-and-domain-settings/Reimbursement.md b/docs/articles/expensify-classic/policy-and-domain-settings/Reimbursement.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/policy-and-domain-settings/Reimbursement.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/policy-and-domain-settings/SAML.md b/docs/articles/expensify-classic/policy-and-domain-settings/SAML.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/policy-and-domain-settings/SAML.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/policy-and-domain-settings/Tags.md b/docs/articles/expensify-classic/policy-and-domain-settings/Tags.md
new file mode 100644
index 000000000000..3ee1c8656b4b
--- /dev/null
+++ b/docs/articles/expensify-classic/policy-and-domain-settings/Tags.md
@@ -0,0 +1,5 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/policy-and-domain-settings/reports/Currency.md b/docs/articles/expensify-classic/policy-and-domain-settings/reports/Currency.md
new file mode 100644
index 000000000000..e5c9096fa610
--- /dev/null
+++ b/docs/articles/expensify-classic/policy-and-domain-settings/reports/Currency.md
@@ -0,0 +1,5 @@
+---
+title: Currency
+description: Currency
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/policy-and-domain-settings/reports/Report-Fields-And-Titles.md b/docs/articles/expensify-classic/policy-and-domain-settings/reports/Report-Fields-And-Titles.md
new file mode 100644
index 000000000000..47b96f495a1c
--- /dev/null
+++ b/docs/articles/expensify-classic/policy-and-domain-settings/reports/Report-Fields-And-Titles.md
@@ -0,0 +1,5 @@
+---
+title: Report Fields & Titles
+description: Report Fields & Titles
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/policy-and-domain-settings/reports/Scheduled-Submit.md b/docs/articles/expensify-classic/policy-and-domain-settings/reports/Scheduled-Submit.md
new file mode 100644
index 000000000000..c05df92bbbff
--- /dev/null
+++ b/docs/articles/expensify-classic/policy-and-domain-settings/reports/Scheduled-Submit.md
@@ -0,0 +1,38 @@
+---
+title: Scheduled Submit
+description: How to use the Scheduled Submit feature
+---
+# Overview
+
+Scheduled Submit reduces the delay between the time an employee creates an expense to when it is submitted to the admin. This gives admins significantly faster visibility into employee spend. Without Scheduled Submit enabled, expenses can be left Unreported giving workspace admins no visibility into employee spend.
+
+The biggest delay in expense management is the time it takes for an employee to actually submit the expense after it is incurred. Scheduled Submit allows you to automatically collect employee expenses on a schedule of your choosing without delaying the process while you wait for employees to submit them. 
+
+It works like this: Employee expenses are automatically gathered onto a report. If there is not an existing report, a new one will be created. This report is submitted automatically at the cadence you choose (daily, weekly, monthly, twice month, by trip).
+
+# How to enable Scheduled Submit
+
+**For workspace admins**: To enable Scheduled Submit on your group workspace, follow **Settings > Workspaces > Group > *[Workspace Name]* > Reports > Scheduled Submit**. From there, toggle Scheduled Submit to Enabled. Then, choose your desired frequency from the dropdown menu. 
+For individuals or employees: To enable Scheduled Submit on your individual workspace, follow **Settings > Workspaces > Individual > *[Workspace Name]* > Reports > Scheduled Submit**. From there, toggle Scheduled Submit to Enabled. Then, choose your desired frequency from the dropdown menu.
+
+## Scheduled Submit frequency options
+
+**Daily**: Each night, expenses without violations will be submitted. Expenses with violations will remain on an open report until the violations are corrected, after which they will be submitted in the evening (PDT).
+
+**Weekly**: Expenses that are free of violations will be submitted on a weekly basis. However, expenses with violations will be held in a new open report and combined with any new expenses. They will then be submitted at the end of the following weekly cycle, specifically on Sunday evening (PDT).
+
+**Twice a month**: Expenses that are violation-free will be submitted on both the 15th and the last day of each month, in the evening (PDT). Expenses with violations will not be submitted, but moved on to a new open report so the employee can resolve the violations and then will be submitted at the conclusion of the next cycle.
+
+**Monthly**: Expenses that are free from violations will be submitted on a monthly basis. Expenses with violations will be held back and moved to a new Open report so the violations can be resolved, and they will be submitted on the evening (PDT) of the specified date.
+
+**By trip**: Expenses are grouped by trip. This is calculated by grouping all expenses together that occur in a similar time frame. If two full days pass without any new expenses being created, the trip report will be submitted on the evening of the second day. Any expenses generated after this submission will initiate a new trip report. Please note that the "2-day" period refers to a date-based interval, not a 48-hour time frame.
+
+**Manually**: An open report will be created, and expenses will be added to it automatically. However, it's important to note that the report will not be submitted automatically; manual submission of reports will be required.This is a great option for automatically gathering all an employee’s expenses on a report for the employee’s convenience, but they will still need to review and submit the report.
+
+# Deep Dive
+
+## Schedule Submit Override
+If Scheduled Submit is disabled at the group workspace level or configured the frequency as "Manually," the individual workspace settings of a user will take precedence and be applied. This means an employee can still set up Scheduled Submit for themselves even if the admin has not enabled it. We highly recommend Scheduled Submit as it helps put your expenses on auto-pilot!
+
+## Personal Card Transactions
+Personal card transactions are handled differently compared to other expenses. If a user has added a card through Settings > Account > Credit Card Import, they need to make sure it is set as non-reimbursable and transactions must be automatically merged with a SmartScanned receipt. If transactions are set to come in as reimbursable or they aren’t merged with a SmartScanned receipt, Scheduled Submit settings will not apply.
diff --git a/docs/articles/expensify-classic/policy-and-domain-settings/tax-tracking.md b/docs/articles/expensify-classic/policy-and-domain-settings/tax-tracking.md
new file mode 100644
index 000000000000..7b859c5101b1
--- /dev/null
+++ b/docs/articles/expensify-classic/policy-and-domain-settings/tax-tracking.md
@@ -0,0 +1,19 @@
+---
+title: Tax
+description: How to track expense taxes
+---
+# Overview
+Expensify’s tax tracking feature allows you to:
+- Add tax names, rates, and codes whether you’re connected to an accounting system or not.
+- Enable/disable taxes you’d like to make available to users.
+- Set a default tax for Workspace currency expenses and, optionally, another default tax (including exempt) for foreign currency expenses which - will automatically apply to all new expenses.
+
+# How to Enable Tax Tracking
+Tax tracking can be enabled in the Tax section of the Workspace settings of any Workspace, whether group or individual. 
+## If Connected to an Accounting Integration
+If your group Workspace is connected to Xero, QuickBooks Online, Sage Intacct, or NetSuite, make sure to first enable tax via the connection configuration page (Settings > Policies > Group > [Workspace Name] > Connections > Configure) and then sync the connection. Your tax rates will be imported from the accounting system and indicated by its logo.
+## Not Connected to an Accounting Integration
+If your Workspace is not connected to an accounting system, go to Settings > Policies > Group > [Workspace Name] > Tax to enable tax.
+
+# Tracking Tax by Expense Category
+To set a different tax rate for a specific expense type in the Workspace currency, go to Settings > Workspaces > Group > [Workspace Name] > Categories page. Click "Edit Rules" next to the desired category and set the "Category default tax". This will be applied to new expenses, overriding the default Workspace currency tax rate.
diff --git a/docs/articles/expensify-classic/send-payments/Pay-Bills.md b/docs/articles/expensify-classic/send-payments/Pay-Bills.md
new file mode 100644
index 000000000000..41c0146126ba
--- /dev/null
+++ b/docs/articles/expensify-classic/send-payments/Pay-Bills.md
@@ -0,0 +1,5 @@
+---
+title: Pay Bills
+description: Pay Bills
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/send-payments/Pay-Invoices.md b/docs/articles/expensify-classic/send-payments/Pay-Invoices.md
new file mode 100644
index 000000000000..e5e6799c268c
--- /dev/null
+++ b/docs/articles/expensify-classic/send-payments/Pay-Invoices.md
@@ -0,0 +1,5 @@
+---
+title: Pay Invoices
+description: Pay Invoices
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/send-payments/Reimbursing-Reports.md b/docs/articles/expensify-classic/send-payments/Reimbursing-Reports.md
new file mode 100644
index 000000000000..834d0b159931
--- /dev/null
+++ b/docs/articles/expensify-classic/send-payments/Reimbursing-Reports.md
@@ -0,0 +1,5 @@
+---
+title: Reimbursing Reports
+description: Reimbursing Reports
+---
+## Resource Coming Soon!
diff --git a/docs/articles/expensify-classic/send-payments/Third-Party-Payments.md b/docs/articles/expensify-classic/send-payments/Third-Party-Payments.md
new file mode 100644
index 000000000000..f61f26d91059
--- /dev/null
+++ b/docs/articles/expensify-classic/send-payments/Third-Party-Payments.md
@@ -0,0 +1,8 @@
+---
+title: Third Party Payments
+description: Third Party Payments
+---
+## Resource Coming Soon!
+
+
+ 
\ No newline at end of file
diff --git a/docs/articles/new-expensify/account-settings/Coming-Soon.md b/docs/articles/new-expensify/account-settings/Coming-Soon.md
new file mode 100644
index 000000000000..6b85bb0364b5
--- /dev/null
+++ b/docs/articles/new-expensify/account-settings/Coming-Soon.md
@@ -0,0 +1,4 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
diff --git a/docs/articles/new-expensify/bank-accounts-and-credit-cards/Coming-Soon.md b/docs/articles/new-expensify/bank-accounts-and-credit-cards/Coming-Soon.md
new file mode 100644
index 000000000000..6b85bb0364b5
--- /dev/null
+++ b/docs/articles/new-expensify/bank-accounts-and-credit-cards/Coming-Soon.md
@@ -0,0 +1,4 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
diff --git a/docs/articles/split-bills/workspaces/The-Free-Plan.md b/docs/articles/new-expensify/billing-and-plan-types/The-Free-Plan.md
similarity index 98%
rename from docs/articles/split-bills/workspaces/The-Free-Plan.md
rename to docs/articles/new-expensify/billing-and-plan-types/The-Free-Plan.md
index 45c9d09d4777..0a8d6b3493e0 100644
--- a/docs/articles/split-bills/workspaces/The-Free-Plan.md
+++ b/docs/articles/new-expensify/billing-and-plan-types/The-Free-Plan.md
@@ -59,4 +59,4 @@ Categories are standardized on the Free Plan and can’t be edited. Custom categ
 
 ## With the Free Plan, can I export reports using a custom format?
 
-The Free Plan offers standard report export formats. You'll need to upgrade to a paid plan to create a custom export format.
+The Free Plan offers standard report export formats. You'll need to upgrade to a paid plan to create a custom export format.
\ No newline at end of file
diff --git a/docs/articles/new-expensify/expense-and-report-features/Coming-Soon.md b/docs/articles/new-expensify/expense-and-report-features/Coming-Soon.md
new file mode 100644
index 000000000000..6b85bb0364b5
--- /dev/null
+++ b/docs/articles/new-expensify/expense-and-report-features/Coming-Soon.md
@@ -0,0 +1,4 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
diff --git a/docs/articles/new-expensify/expensify-card/Coming-Soon.md b/docs/articles/new-expensify/expensify-card/Coming-Soon.md
new file mode 100644
index 000000000000..6b85bb0364b5
--- /dev/null
+++ b/docs/articles/new-expensify/expensify-card/Coming-Soon.md
@@ -0,0 +1,4 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
diff --git a/docs/articles/new-expensify/exports/Coming-Soon.md b/docs/articles/new-expensify/exports/Coming-Soon.md
new file mode 100644
index 000000000000..6b85bb0364b5
--- /dev/null
+++ b/docs/articles/new-expensify/exports/Coming-Soon.md
@@ -0,0 +1,4 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
diff --git a/docs/articles/new-expensify/get-paid-back/Request-Money.md b/docs/articles/new-expensify/get-paid-back/Request-Money.md
new file mode 100644
index 000000000000..dc6de6656cc9
--- /dev/null
+++ b/docs/articles/new-expensify/get-paid-back/Request-Money.md
@@ -0,0 +1,5 @@
+---
+title: Request Money
+description: Request Money
+---
+## Resource Coming Soon!
diff --git a/docs/articles/other/Expensify-Lounge.md b/docs/articles/new-expensify/getting-started/Expensify-Lounge.md
similarity index 100%
rename from docs/articles/other/Expensify-Lounge.md
rename to docs/articles/new-expensify/getting-started/Expensify-Lounge.md
diff --git a/docs/articles/new-expensify/getting-started/Referral-Program.md b/docs/articles/new-expensify/getting-started/Referral-Program.md
new file mode 100644
index 000000000000..683e93d0277a
--- /dev/null
+++ b/docs/articles/new-expensify/getting-started/Referral-Program.md
@@ -0,0 +1,53 @@
+---
+title: Expensify Referral Program
+description: Send your joining link, submit a receipt or invoice, and we'll pay you if your referral adopts Expensify.
+---
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# About
+
+Expensify has grown thanks to our users who love Expensify so much that they tell their friends, colleagues, managers, and fellow business founders to use it, too. 
+
+As a thank you, every time you bring a new user into the platform who directly or indirectly leads to the adoption of a paid annual plan on Expensify, you will earn $250. 
+
+# How to get paid for referring people to Expensify
+
+1. Submit a report or invoice, or share your referral link with anyone you know who is spending too much time on expenses, or works at a company that could benefit from using Expensify. 
+
+2. You will get $250 for any referred business that commits to an annual subscription, has 2 or more active users, and makes two monthly payments.
+
+That’s right! You can refer anyone working at any company you know. 
+
+If their company goes on to become an Expensify customer with an annual subscription, and you are the earliest recorded referrer of a user on that company’s paid Expensify Policy, you'll get paid a referral reward. 
+
+The best way to start is to submit any receipt to your manager (you'll get paid back and set yourself up for $250 if they start a subscription: win-win!)
+
+Referral rewards for the Spring/Summer 2023 campaign will be paid by direct deposit.
+
+# FAQ
+
+- **How will I know if I am the first person to refer a company to Expensify?**
+
+Successful referrers are notified after their referral pays for 2 months of an annual subscription.  We will check for the earliest recorded referrer of a user on the policy, and if that is you, then we will let you know. 
+
+- **How will you pay me if I am successful?**
+
+In the Spring 2023 campaign, Expensify will be paying successful referrers via direct deposit to the Deposit-Only account you have on file. Referral payouts will happen once a month for the duration of the campaign. If you do not have a Deposit-Only account at the time of your referral payout, your deposit will be processed in the next batch. 
+
+Learn how to add a Deposit-Only account [here](https://community.expensify.com/discussion/4641/how-to-add-a-deposit-only-bank-account-both-personal-and-business).
+
+- **I’m outside of the US, how do I get paid?**
+
+While our referral payouts are in USD, you will be able to get paid via a Wise Borderless account. Learn more [here](https://community.expensify.com/discussion/5940/how-to-get-reimbursed-outside-the-us-with-wise-for-non-us-employees).
+
+- **My referral wasn’t counted! How can I appeal?**
+
+Expensify reserves the right to modify the terms of the referral program at any time, and pays out referral bonuses for eligible companies at its own discretion.
+
+Please send a message to concierge@expensify.com with the billing owner of the company you have referred and our team will review the referral and get back to you.
+
+- **Where can I find my referral link?**
+
+Expensify members who are opted-in for our newsletters will have received an email containing their unique referral link. 
+
+On the mobile app, go to **Settings** > **Invite a Friend** > **Share Invite Link** to retrieve your referral link.
diff --git a/docs/articles/other/Everything-About-Chat.md b/docs/articles/new-expensify/getting-started/chat/Everything-About-Chat.md
similarity index 99%
rename from docs/articles/other/Everything-About-Chat.md
rename to docs/articles/new-expensify/getting-started/chat/Everything-About-Chat.md
index d52932daa5ff..9f73d1c759c2 100644
--- a/docs/articles/other/Everything-About-Chat.md
+++ b/docs/articles/new-expensify/getting-started/chat/Everything-About-Chat.md
@@ -83,5 +83,3 @@ You will receive a whisper from Concierge any time your content has been flagged
 ![Moderation Reporter Whisper](https://help.expensify.com/assets/images/moderation-reporter-whisper.png){:width="100%"}
 
 *Note: Any message sent in public chat rooms are automatically reviewed by an automated system looking for offensive content and sent to our moderators for final decisions if it is found.*
-
-
diff --git a/docs/articles/other/Expensify-Chat-For-Admins.md b/docs/articles/new-expensify/getting-started/chat/Expensify-Chat-For-Admins.md
similarity index 99%
rename from docs/articles/other/Expensify-Chat-For-Admins.md
rename to docs/articles/new-expensify/getting-started/chat/Expensify-Chat-For-Admins.md
index 247b2b0e03d0..31de150d5b5e 100644
--- a/docs/articles/other/Expensify-Chat-For-Admins.md
+++ b/docs/articles/new-expensify/getting-started/chat/Expensify-Chat-For-Admins.md
@@ -24,3 +24,4 @@ In order to get the most out of Expensify Chat, we created a list of best practi
 - The rooms will all stay open after the conference ends, so encourage speakers to keep engaging as long as the conversation is going in their session room.
 - Continue sharing photos and videos from the event or anything fun in #social as part of a wrap up for everyone.
 - Use the #announce room to give attendees a sneak preview of your next event.
+- 
\ No newline at end of file
diff --git a/docs/articles/other/Expensify-Chat-For-Conference-Attendees.md b/docs/articles/new-expensify/getting-started/chat/Expensify-Chat-For-Conference-Attendees.md
similarity index 100%
rename from docs/articles/other/Expensify-Chat-For-Conference-Attendees.md
rename to docs/articles/new-expensify/getting-started/chat/Expensify-Chat-For-Conference-Attendees.md
diff --git a/docs/articles/other/Expensify-Chat-For-Conference-Speakers.md b/docs/articles/new-expensify/getting-started/chat/Expensify-Chat-For-Conference-Speakers.md
similarity index 100%
rename from docs/articles/other/Expensify-Chat-For-Conference-Speakers.md
rename to docs/articles/new-expensify/getting-started/chat/Expensify-Chat-For-Conference-Speakers.md
diff --git a/docs/articles/playbooks/Expensify-Chat-Playbook-for-Conferences.md b/docs/articles/new-expensify/getting-started/chat/Expensify-Chat-Playbook-For-Conferences.md
similarity index 100%
rename from docs/articles/playbooks/Expensify-Chat-Playbook-for-Conferences.md
rename to docs/articles/new-expensify/getting-started/chat/Expensify-Chat-Playbook-For-Conferences.md
diff --git a/docs/articles/new-expensify/integrations/accounting-integrations/QuickBooks-Online.md b/docs/articles/new-expensify/integrations/accounting-integrations/QuickBooks-Online.md
new file mode 100644
index 000000000000..aa5f40ee4e5d
--- /dev/null
+++ b/docs/articles/new-expensify/integrations/accounting-integrations/QuickBooks-Online.md
@@ -0,0 +1,5 @@
+---
+title: QuickBooks Online
+description: QuickBooks Online
+---
+## Resource Coming Soon!
diff --git a/docs/articles/new-expensify/manage-employees-and-report-approvals/Coming-Soon.md b/docs/articles/new-expensify/manage-employees-and-report-approvals/Coming-Soon.md
new file mode 100644
index 000000000000..6b85bb0364b5
--- /dev/null
+++ b/docs/articles/new-expensify/manage-employees-and-report-approvals/Coming-Soon.md
@@ -0,0 +1,4 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
diff --git a/docs/articles/new-expensify/send-payments/Coming-Soon.md b/docs/articles/new-expensify/send-payments/Coming-Soon.md
new file mode 100644
index 000000000000..6b85bb0364b5
--- /dev/null
+++ b/docs/articles/new-expensify/send-payments/Coming-Soon.md
@@ -0,0 +1,4 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
diff --git a/docs/articles/new-expensify/workspace-and-domain-settings/Coming-Soon.md b/docs/articles/new-expensify/workspace-and-domain-settings/Coming-Soon.md
new file mode 100644
index 000000000000..6b85bb0364b5
--- /dev/null
+++ b/docs/articles/new-expensify/workspace-and-domain-settings/Coming-Soon.md
@@ -0,0 +1,4 @@
+---
+title: Coming Soon
+description: Coming Soon
+---
diff --git a/docs/articles/request-money/Request-and-Split-Bills.md b/docs/articles/request-money/Request-and-Split-Bills.md
deleted file mode 100644
index bb27cd75c742..000000000000
--- a/docs/articles/request-money/Request-and-Split-Bills.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-title: Request Money and Split Bills with Friends
-description: Everything you need to know about Requesting Money and Splitting Bills with Friends!
----
-
-<!-- The lines above are required by Jekyll to process the .md file -->
-
-# How do these Payment Features work?
-Our suite of money movement features enables you to request money owed by an individual or split a bill with a group.
-
-**Request Money** lets your friends pay you back directly in Expensify. When you send a payment request to a friend, Expensify will display the amount owed and the option to pay the corresponding request in a chat between you.
-
-**Split Bill** allows you to split payments between friends and ensures the person who settled the tab gets paid back.
-
-These two features ensure you can live in the moment and settle up afterward.
-
-# How to Request Money
-- Select the Green **+** button and choose **Request Money**
-- Select the relevant option: 
-    - **Manual:** Enter the merchant and amount manually.
-    - **Scan:** Take a photo of the receipt to have the merchant and amount auto-filled.
-    - **Distance:** Enter the details of your trip, plus any stops along the way, and the mileage and amount will be automatically calculated.
-- Search for the user or enter their email!
-- Enter a reason for the request (optional)
-- Click **Request!**
-- If you change your mind, all you have to do is click **Cancel**
-- The user will be able to **Settle up outside of Expensify** or pay you via **Venmo** or **PayPal.me**
-
-# How to Split a Bill
-- Select the Green **+** button and choose **Split Bill**
-- Enter the total amount for the bill and click **Next**
-- Search for users or enter their emails and **Select**
-- Enter a reason for the split
-- The split is then shared equally between the attendees
-
-# FAQs
-## Can I request money from more than one person at a time?
-If you need to request money for more than one person at a time, you’ll want to use the Split Bill feature. The Request Money option is for one-to-one payments between two people.
diff --git a/docs/articles/split-bills/paying-friends/Request-and-Split-Bills.md b/docs/articles/split-bills/paying-friends/Request-and-Split-Bills.md
deleted file mode 100644
index a2c63cf6f8f7..000000000000
--- a/docs/articles/split-bills/paying-friends/Request-and-Split-Bills.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-title: Request Money and Split Bills with Friends
-description: Everything you need to know about Requesting Money and Splitting Bills with Friends!
----
-
-<!-- The lines above are required by Jekyll to process the .md file -->
-
-# How do these Payment Features work?
-Our suite of money movement features enables you to request money owed by an individual or split a bill with a group.
-
-**Request Money** lets your friends pay you back directly in Expensify. When you send a payment request to a friend, Expensify will display the amount owed and the option to pay the corresponding request in a chat between you.
-
-**Split Bill** allows you to split payments between friends and ensures the person who settled the tab gets paid back.
-
-These two features ensure you can live in the moment and settle up afterward.
-
-# How to Request Money
-- Select the Green **+** button and choose **Request Money**
-- Enter the amount **$** they owe and click **Next**
-- Search for the user or enter their email!
-- Enter a reason for the request (optional)
-- Click **Request!**
-- If you change your mind, all you have to do is click **Cancel**
-- The user will be able to **Settle up outside of Expensify** or pay you via **Venmo** or **PayPal.me**
-
-# How to Split a Bill
-- Select the Green **+** button and choose **Split Bill**
-- Enter the total amount for the bill and click **Next**
-- Search for users or enter their emails and **Select**
-- Enter a reason for the split
-- The split is then shared equally between the attendees
-
-# FAQs
-## Can I request money from more than one person at a time?
-If you need to request money for more than one person at a time, you’ll want to use the Split Bill feature. The Request Money option is for one-to-one payments between two people.
diff --git a/docs/assets/images/accounting.svg b/docs/assets/images/accounting.svg
new file mode 100644
index 000000000000..4398e9573747
--- /dev/null
+++ b/docs/assets/images/accounting.svg
@@ -0,0 +1,68 @@
+<svg width="69" height="68" viewBox="0 0 69 68" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M40.05 9.12029V8.99945H49.3344C53.1492 8.81148 55.4451 11.2383 55.4451 15.1085V47.8054C55.4451 49.764 54.856 51.3534 53.7802 52.4208L53.7433 52.4594C52.696 53.4764 51.1956 54.0084 49.3344 53.9161H30.0304C26.2173 54.1041 23.9214 51.6773 23.9214 47.8071V15.1085C23.9214 13.2926 24.4266 11.7955 25.3614 10.7365C25.8716 10.1524 26.5077 9.70434 27.2612 9.40728C27.8486 9.17567 28.5015 9.03805 29.2215 9.00113C29.4816 8.98602 29.7535 8.98602 30.0304 8.99945H30.6816" fill="#4ED7DE"/>
+<path d="M33.9491 8.99959H33.298C33.021 8.98616 32.7491 8.98616 32.489 9.00127C31.769 9.03819 31.962 8.74616 31.3763 8.97945L30.4717 9.17917V8.08491C30.4717 5.87792 31.8647 4.82227 34.0649 4.82227H39.7242C41.9262 4.82227 43.3175 5.87792 43.3175 8.08491V17.9668C43.3175 18.7506 42.621 19.2306 41.9245 18.6633L39.6806 16.6242C38.8783 15.884 38.3665 15.884 37.586 16.6242L35.3388 18.6633C34.6423 19.2306 33.9458 18.7506 33.9458 17.9668V8.99959H33.9491Z" fill="#D18000"/>
+<path d="M23.9215 47.805C23.9215 51.6769 26.2191 54.1038 30.0305 53.9141H49.3345C51.1957 54.0064 52.6961 53.4744 53.7434 52.4573L48.6161 57.5846C47.5705 58.5647 46.0903 59.0766 44.2643 58.986H24.9603C21.3453 59.1639 19.0913 56.9921 18.8681 53.4626C18.8563 53.2713 18.8496 53.0766 18.8496 52.8752V46.0479H23.9215V47.8034V47.805Z" fill="#FFFAF0"/>
+<path d="M47.3388 23.0938C48.6881 23.0938 49.1782 23.7282 49.1782 24.9315V33.5866C49.1782 34.7899 48.6864 35.4277 47.3388 35.4277H34.5181C33.1688 35.4277 32.6787 34.7899 32.6787 33.5866V24.9315C32.6787 23.7282 33.1705 23.0938 34.5181 23.0938H47.3388Z" fill="#FFFAF0"/>
+<path d="M26.0176 17.4398C26.37 16.8524 27.0128 16.458 27.7479 16.458C28.8623 16.458 29.7652 17.3609 29.7652 18.4753C29.7652 19.5897 28.8623 20.4893 27.7479 20.4893C27.0128 20.4893 26.37 20.0983 26.0176 19.5075H26.7158C27.2881 19.5075 27.7479 19.0426 27.7479 18.4753C27.7479 17.9081 27.2864 17.4415 26.7158 17.4415H26.0176V17.4398Z" fill="#002140"/>
+<path d="M26.0176 30.6547C26.37 30.0656 27.0128 29.6729 27.7479 29.6729C28.8623 29.6729 29.7652 30.5758 29.7652 31.6902C29.7652 32.8046 28.8623 33.7042 27.7479 33.7042C27.0229 33.7042 26.3902 33.3249 26.036 32.7509H26.7158C27.2881 32.7509 27.7479 32.286 27.7479 31.717C27.7479 31.1481 27.2864 30.6849 26.7158 30.6849H26.0176V30.6547Z" fill="#002140"/>
+<path d="M26.0176 43.9823C26.37 43.3932 27.0128 43.0005 27.7479 43.0005C28.8623 43.0005 29.7652 43.9034 29.7652 45.0161C29.7652 46.1289 28.8623 47.0318 27.7479 47.0318C27.0128 47.0318 26.37 46.6391 26.0176 46.05H26.7158C27.2881 46.05 27.7479 45.5851 27.7479 45.0161C27.7479 44.4472 27.2864 43.984 26.7158 43.984H26.0176V43.9823Z" fill="#002140"/>
+<path d="M27.5599 17.4413C28.1322 17.4413 28.5921 17.9046 28.5921 18.4752C28.5921 19.0458 28.1306 19.5073 27.5599 19.5073H18.8495C16.2632 19.5073 15.085 20.8936 15.085 22.1826C15.085 23.4715 16.2615 24.8578 18.8495 24.8578V26.9238C15.0213 26.9238 13.019 24.5373 13.019 22.1809C13.019 19.8245 15.0213 17.438 18.8495 17.438H27.5599V17.4413Z" fill="#002140"/>
+<path d="M27.5599 30.685C28.1322 30.685 28.5921 31.1482 28.5921 31.7172C28.5921 32.2861 28.1306 32.751 27.5599 32.751H18.8495C16.2632 32.751 15.085 34.1373 15.085 35.4246C15.085 36.7118 16.2615 38.1015 18.8495 38.1015V40.1658C15.0213 40.1658 13.019 37.7809 13.019 35.4229C13.019 33.0648 15.0213 30.6816 18.8495 30.6816H27.5599V30.685Z" fill="#002140"/>
+<path d="M25.361 10.7365C24.4262 11.7956 23.921 13.2926 23.921 15.1085V17.4414H19.3711V17.3038C19.5641 16.8305 19.8108 16.4059 20.1045 16.0249L20.2136 15.894L25.3576 10.7349H25.361V10.7365Z" fill="#FFFAF0"/>
+<path d="M23.9215 32.751V43.9839H18.8496V40.1674V38.1031V32.751H23.9215Z" fill="#FFFAF0"/>
+<path d="M23.9215 19.509V30.6849H18.8496V20.1803C18.8496 20.0058 18.8563 19.8329 18.8647 19.6651V19.5073H23.9215V19.509Z" fill="#FFFAF0"/>
+<path d="M27.5599 43.9836C28.1322 43.9836 28.5921 44.4468 28.5921 45.0158C28.5921 45.5847 28.1306 46.0496 27.5599 46.0496H18.8495C16.2632 46.0496 15.085 47.4359 15.085 48.7232C15.085 50.0104 16.2615 51.4001 18.8495 51.4001V52.877C18.8495 53.0767 18.8562 53.2714 18.868 53.4644L18.8495 53.4678C15.0213 53.4678 13.019 51.0812 13.019 48.7232C13.019 46.3651 15.0213 43.9819 18.8495 43.9819H27.5599V43.9836Z" fill="#002140"/>
+<path d="M55.4468 15.1084V47.8053" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M55.4467 15.1087C55.4467 11.2368 53.1491 8.80997 49.3359 8.99962" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M23.9214 46.0498V47.8053" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M23.9214 32.751V43.9839" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M23.9214 19.5088V30.6847" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M23.9214 15.1084V17.4413" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M23.9214 15.1087C23.9214 13.2927 24.4266 11.7957 25.3614 10.7367C25.8716 10.1526 26.5077 9.70451 27.2612 9.40745C27.8486 9.17584 28.5015 9.03822 29.2215 9.00129C29.4816 8.98619 29.7535 8.98619 30.0304 8.99962" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.0308 8.99951H33.8775" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M43.583 8.99951H49.3346" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M53.7449 52.4595C52.6976 53.4765 51.1972 54.0086 49.3359 53.9162" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M55.4466 47.8052C55.4466 49.7638 54.8575 51.3531 53.7817 52.4205" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M23.9214 47.8052C23.9214 51.677 26.219 54.1039 30.0304 53.9142" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.0308 53.916H49.3347" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.8496 20.1802V24.8593V26.9253V30.6847" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.8496 32.751V38.1031V40.1674V43.9839" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.8496 46.0498V51.4019V52.8789" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.3711 17.3038C19.5641 16.8305 19.8108 16.4059 20.1045 16.0249" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.8496 20.1803C18.8496 20.0057 18.8563 19.8329 18.8647 19.665" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M48.618 57.585C47.5724 58.5668 46.0921 59.0787 44.2661 58.988" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.8496 52.8789C18.8496 53.0786 18.8563 53.2733 18.8681 53.4663C19.0913 56.9941 21.3453 59.1675 24.9603 58.9896" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M24.9604 58.9878H44.2644" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20.2139 15.894L25.3579 10.7349" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M48.6182 57.5867L53.7454 52.4595L53.7823 52.4209" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M32.6787 24.9315C32.6787 23.7282 33.1705 23.0938 34.5181 23.0938" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M49.1783 24.9315C49.1783 23.7282 48.6866 23.0938 47.3389 23.0938" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M32.6787 24.9316V33.5867" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M34.5181 23.0938H47.3387" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M32.6787 33.5864C32.6787 34.7898 33.1705 35.4275 34.5181 35.4275" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M49.1783 33.5864C49.1783 34.7898 48.6866 35.4275 47.3389 35.4275" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M34.5181 35.4292H47.3387" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M49.1787 24.9316V33.5867" stroke="#04223F" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.8496 17.4414H26.1721C26.7444 17.4414 27.2042 17.9046 27.2042 18.4752C27.2042 19.0459 26.7427 19.5074 26.1721 19.5074H18.8496" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.8494 19.5088C16.2631 19.5088 15.085 20.8951 15.085 22.184C15.085 23.473 16.2615 24.8593 18.8494 24.8593" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.8495 26.9253C15.0213 26.9253 13.019 24.5387 13.019 22.1824C13.019 19.826 15.0213 17.4395 18.8495 17.4395" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.8496 30.6851H26.1721C26.7444 30.6851 27.2042 31.1483 27.2042 31.7172C27.2042 32.2862 26.7427 32.7511 26.1721 32.7511H18.8496" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.8494 32.751C16.2631 32.751 15.085 34.1373 15.085 35.4245C15.085 36.7118 16.2615 38.1014 18.8494 38.1014" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.8495 40.1673C15.0213 40.1673 13.019 37.7824 13.019 35.4243C13.019 33.0663 15.0213 30.6831 18.8495 30.6831" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.8496 43.9839H26.1721C26.7444 43.9839 27.2042 44.4471 27.2042 45.016C27.2042 45.585 26.7427 46.0499 26.1721 46.0499H18.8496" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.8494 46.0498C16.2631 46.0498 15.085 47.4361 15.085 48.7234C15.085 50.0106 16.2615 51.4003 18.8494 51.4003" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.8495 53.4678C15.0213 53.4678 13.019 51.0812 13.019 48.7232C13.019 46.3651 15.0213 43.9819 18.8495 43.9819" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M26.0176 17.4398C26.37 16.8524 27.0128 16.458 27.7479 16.458C28.8623 16.458 29.7652 17.3609 29.7652 18.4753C29.7652 19.5897 28.8623 20.4893 27.7479 20.4893C27.0128 20.4893 26.37 20.0983 26.0176 19.5075" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M26.0176 30.6547C26.37 30.0656 27.0128 29.6729 27.7479 29.6729C28.8623 29.6729 29.7652 30.5758 29.7652 31.6902C29.7652 32.8046 28.8623 33.7042 27.7479 33.7042C27.0229 33.7042 26.3902 33.3249 26.036 32.7509C26.0276 32.7408 26.0226 32.7307 26.0176 32.7223" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M26.0176 43.9823C26.37 43.3932 27.0128 43.0005 27.7479 43.0005C28.8623 43.0005 29.7652 43.9034 29.7652 45.0161C29.7652 46.1289 28.8623 47.0318 27.7479 47.0318C27.0128 47.0318 26.37 46.6391 26.0176 46.05" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M33.9492 8.08301V8.99937V9.12021V17.9649" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M35.3423 18.6614L37.5879 16.6206" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M35.3422 18.6613C34.6457 19.2286 33.9492 18.7486 33.9492 17.9648" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M43.3179 8.08301V8.99937V9.12021V17.9649" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M41.9244 18.6614L39.6821 16.6206" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M41.9248 18.6613C42.6213 19.2286 43.3178 18.7486 43.3178 17.9648" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M37.5879 16.6205C38.3683 15.8804 38.8802 15.8804 39.6824 16.6205" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M43.3179 8.08295C43.3179 5.87597 41.9249 4.82031 39.7246 4.82031" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.3965 8.89693C30.3965 5.5487 31.8633 4.82031 34.0653 4.82031" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M39.7247 4.82031H34.0654" stroke="#06233E" stroke-width="0.99999" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/docs/assets/images/bank-card.svg b/docs/assets/images/bank-card.svg
new file mode 100644
index 000000000000..48da9af0d986
--- /dev/null
+++ b/docs/assets/images/bank-card.svg
@@ -0,0 +1,41 @@
+<svg width="69" height="68" viewBox="0 0 69 68" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M58.6908 22.0572L32.0748 2.52783L6.38704 22.1728L6.85295 27.7497V52.2744H5.68994V56.3449H16.0344V54.2501H26.8447V56.2258H37.7672V54.2501H48.2307V56.5761H58.922V52.6247H57.759V27.1717L58.6908 22.0572Z" fill="#AAD3FF"/>
+<path d="M15.3374 27.2874H6.85303V52.1589H15.3374V27.2874Z" fill="#DFF4F8"/>
+<path d="M36.2606 27.634H28.123V52.5056H36.2606V27.634Z" fill="#DFF4F8"/>
+<path d="M57.7624 27.7498H49.5093V52.2745H57.7624V27.7498Z" fill="#DFF4F8"/>
+<path d="M15.3368 43.6746H28.1228V27.6342L27.4257 22.2886H15.9183L15.1021 28.1001L15.3368 43.6746Z" fill="#59A9FF"/>
+<path d="M36.492 43.6746H49.2746V27.6342L48.5775 22.2886H37.07L36.2573 28.1001L36.492 43.6746Z" fill="#59A9FF"/>
+<path d="M18.6689 43.4817H24.8693V33.7188C24.8693 33.7188 24.6381 30.5415 21.8462 30.5415C19.0543 30.5415 18.9001 33.95 18.9001 33.95L18.6689 43.4817Z" fill="#002140"/>
+<path d="M39.7569 43.4011L45.7856 43.4817V33.7188C45.7856 33.7188 45.5544 30.5415 42.7625 30.5415C39.9706 30.5415 39.8165 33.95 39.8165 33.95L39.7534 43.4011H39.7569Z" fill="#002140"/>
+<path d="M19.1382 18.5682H45.6386L32.1905 7.52661L19.1382 18.5682Z" fill="#87C2FF"/>
+<path d="M6.16943 22.1308H58.4697L32.3195 2.25464L6.16943 22.1308Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.16943 22.1309C6.16943 22.1309 6.86654 25.154 6.86654 27.5921H15.1162C15.1162 25.1505 15.8133 22.1309 15.8133 22.1309" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.8667 27.592V52.1168" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M15.1167 27.592V52.0012" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.1265 27.9424V51.8856" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16.3181 52.397H5.75293V56.2713H16.3181V52.397Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M48.7075 22.1309C48.7075 22.1309 49.4046 25.154 49.4046 27.5921H57.6578C57.6578 25.1505 58.3549 22.1309 58.3549 22.1309" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M49.4038 27.592V52.1168" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M57.6572 27.592V52.0012" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M53.668 27.9424V51.8856" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M58.8586 52.397H48.2935V56.2713H58.8586V52.397Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M27.4961 22.1309C27.4961 22.1309 28.1932 25.154 28.1932 27.5921H36.4463C36.4463 25.1505 37.1434 22.1309 37.1434 22.1309" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M28.1934 27.592V52.1168" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M36.4468 27.592V52.0012" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M32.4565 27.9424V51.8856" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M37.6447 52.397H27.0796V56.2713H37.6447V52.397Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16.3955 54.1521H27.0797" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M38.2471 54.1521H48.2938" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M15.4668 48.8625H27.787" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M15.4668 43.6326H27.787" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M36.6221 48.8625H48.9422" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M36.6221 43.6326H48.9422" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M24.879 43.5168V33.5787C24.879 31.8762 23.4988 30.4995 21.7999 30.4995C20.0974 30.4995 18.7207 31.8797 18.7207 33.5787V43.4012" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M39.7568 43.4012V33.5787C39.7568 31.8762 41.137 30.4995 42.836 30.4995C44.5385 30.4995 45.9152 31.8797 45.9152 33.5787V43.5168" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M64.8553 46.0814L39.759 46.1996C39.0364 46.2031 38.4534 46.7916 38.4568 47.5141L38.5215 61.227C38.5249 61.9496 39.1134 62.5326 39.8359 62.5292L64.9322 62.4109C65.6548 62.4075 66.2378 61.819 66.2344 61.0964L66.1697 47.3835C66.1663 46.661 65.5778 46.078 64.8553 46.0814Z" fill="#FF7102"/>
+<path d="M64.6389 46.0074L39.8976 46.124C39.0337 46.128 38.3368 46.8316 38.3409 47.6954L38.403 60.8881C38.4071 61.7519 39.1107 62.4489 39.9745 62.4448L64.7158 62.3282C65.5796 62.3241 66.2766 61.6206 66.2725 60.7568L66.2103 47.5641C66.2063 46.7003 65.5027 46.0033 64.6389 46.0074Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M41.0288 59.7755L44.7972 59.7563" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M46.5249 59.7479L50.2933 59.7305" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M46.685 55.1166L46.6711 52.0441C46.6711 51.8841 46.3666 51.7571 45.9943 51.7588L43.5394 51.771C43.3307 51.771 43.1341 51.8145 43.007 51.8858L42.1737 52.3503C42.0815 52.4008 42.031 52.4652 42.0328 52.5278L42.0432 54.7582C42.0432 54.8174 42.0867 54.8748 42.165 54.9235L42.7931 55.3062C42.9201 55.3845 43.1288 55.4298 43.3515 55.428L46.0152 55.4106C46.3875 55.4089 46.6867 55.2767 46.6867 55.1183L46.685 55.1166Z" fill="#F5D5FF"/>
+<path d="M62.7331 51.4398L52.284 51.489C51.8853 51.4909 51.5635 51.8157 51.5654 52.2144L51.5761 54.4796C51.578 54.8784 51.9027 55.2001 52.3015 55.1982L62.7506 55.149C63.1493 55.1471 63.4711 54.8223 63.4692 54.4236L63.4585 52.1584C63.4566 51.7596 63.1319 51.4379 62.7331 51.4398Z" fill="#002140"/>
+</svg>
diff --git a/docs/assets/images/envelope-receipt.svg b/docs/assets/images/envelope-receipt.svg
new file mode 100644
index 000000000000..40f57cc4ebda
--- /dev/null
+++ b/docs/assets/images/envelope-receipt.svg
@@ -0,0 +1,35 @@
+<svg width="68" height="68" viewBox="0 0 68 68" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.1006 40.3966C17.1645 40.9547 17.201 41.5588 17.201 42.2183C17.201 43.7079 16.8129 45.1468 16.1462 46.3367C15.1417 48.1353 13.4978 49.3713 11.5892 49.3805C10.9179 49.3805 10.2147 49.2329 9.49328 48.9055C5.37456 47.0146 7.32889 40.9224 7.32889 38.2752C7.32889 35.628 5.68506 32.9301 5.68506 32.9301C5.68506 32.9301 6.51154 33.0315 7.68962 33.8202C9.01839 34.7056 9.47501 35.4159 9.47501 35.4159V31.7172L12.8038 34.6365L12.9499 30.9839L16.0367 33.8986C16.0275 35.1714 16.2787 36.2598 16.5526 37.4358C16.7581 38.3352 16.9773 39.2852 17.1006 40.4059V40.3966Z" fill="#D4F5FD"/>
+<path d="M26.8997 35.0514C26.8769 35.222 26.854 35.3927 26.8266 35.5679C26.644 36.7531 26.4476 37.8185 26.2559 38.8146C25.991 40.1751 25.7307 41.3973 25.5161 42.5779C25.1189 44.7593 24.8769 46.8116 25.0641 49.3757H25.0184H11.5938C13.5024 49.3665 15.1463 48.1305 16.1508 46.3319C16.8175 45.1421 17.2056 43.7032 17.2056 42.2136C17.2056 41.5541 17.1691 40.9545 17.1052 40.3919C16.9864 39.2712 16.7673 38.3212 16.5572 37.4219C16.2878 36.2458 16.0321 35.1575 16.0412 33.8846C16.0412 33.2758 16.1097 32.6209 16.2604 31.8923C17.0093 28.2996 19.3289 25.7816 22.2604 25.9983C26.0641 26.2751 27.5024 30.2182 26.8997 35.0468V35.0514Z" fill="#84EAF4"/>
+<path d="M26.9 35.0518C27.5028 30.2232 26.0644 26.2801 22.2607 26.0034H35.6352C35.6489 26.1648 35.658 26.3309 35.6717 26.4969C36.1009 31.6621 38.658 39.0042 38.9228 44.5661C38.9457 45.0549 38.9502 45.5299 38.9365 45.9865C38.8589 48.3524 38.4343 50.7321 37.6169 52.6875C36.4936 55.3716 34.6352 57.2671 31.9183 57.2671C31.8726 57.2671 31.8224 57.2671 31.7722 57.2671C28.2105 57.1794 25.4343 54.4723 25.0598 49.4546C25.0598 49.4316 25.0598 49.4039 25.0553 49.3808C24.8726 46.8166 25.1101 44.7644 25.5073 42.583C25.7219 41.4023 25.9822 40.1802 26.247 38.8197C26.4434 37.8282 26.6397 36.7582 26.8178 35.573C26.8452 35.3977 26.868 35.2271 26.8909 35.0565L26.9 35.0518Z" fill="#D4F5FD"/>
+<path d="M38.9274 44.5612C38.6626 38.9994 36.1055 31.6573 35.6762 26.492C35.6626 26.326 35.6489 26.16 35.6397 25.9986C35.0324 17.7249 36.5712 11.605 36.7493 10.9363L38.1922 14.3952L41.3155 11.1254L43.1055 14.3952L46.1055 10.6919L47.7676 13.8925L50.4297 10.8579L51.9274 14.3952C51.9274 14.3952 52.8224 13.6066 53.8132 12.8087C55.0872 11.7849 55.9731 11.6973 55.9731 11.6973C55.9731 11.6973 55.2059 13.8141 54.8863 19.8556C54.4251 28.5535 58.7402 38.1277 58.2927 46.0785C57.6671 57.2622 51.3657 57.2991 51.3657 57.2991H31.9365V57.2576C34.6534 57.2576 36.5119 55.3621 37.6352 52.6781C38.4525 50.7226 38.8772 48.3429 38.9548 45.9771C38.9685 45.5205 38.9639 45.0455 38.9411 44.5566L38.9274 44.5612Z" fill="#D4F5FD"/>
+<path d="M36.7629 10.8765C36.7629 10.8765 36.7583 10.8949 36.7446 10.9364C36.5665 11.6051 35.0277 17.725 35.635 25.9987C35.6487 26.1601 35.6578 26.3261 35.6715 26.4921C36.1008 31.6574 38.6578 38.9994 38.9227 44.5613C38.9455 45.0502 38.9501 45.5252 38.9364 45.9818C38.8587 48.3476 38.4341 50.7273 37.6167 52.6828C36.4934 55.3669 34.635 57.2623 31.9181 57.2623C31.8724 57.2623 31.8222 57.2623 31.772 57.2623C28.2103 57.1747 25.4341 54.4675 25.0597 49.4499C25.0597 49.4268 25.0597 49.3991 25.0551 49.3761C24.8724 46.8119 25.1099 44.7596 25.5071 42.5782C25.7218 41.3976 25.982 40.1755 26.2469 38.815C26.4432 37.8234 26.6396 36.7535 26.8176 35.5682C26.845 35.393 26.8679 35.2224 26.8907 35.0517C27.4934 30.2231 26.0551 26.28 22.2514 26.0033C19.3154 25.7865 16.9957 28.3046 16.2514 31.8972C16.1008 32.6259 16.0368 33.2762 16.0323 33.8895C16.0231 35.1624 16.2743 36.2508 16.5482 37.4268C16.7537 38.3261 16.9729 39.2762 17.0962 40.3968C17.1601 40.9549 17.1966 41.559 17.1966 42.2185C17.1966 43.7081 16.8085 45.147 16.1419 46.3369C15.1373 48.1355 13.4934 49.3715 11.5848 49.3807C10.9135 49.3807 10.2103 49.2331 9.48888 48.9057C5.37016 47.0148 7.3245 40.9226 7.3245 38.2754C7.3245 35.6282 5.68066 32.9303 5.68066 32.9303C5.68066 32.9303 6.50715 33.0317 7.68523 33.8204C9.014 34.7058 9.47062 35.416 9.47062 35.416V31.7174L12.7994 34.6366L12.9455 30.9841L16.0323 33.8988" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M22.2607 26.0034H35.6352H35.6763" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.5894 49.3804H25.0186" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M36.7354 10.9179L36.7445 10.9363L38.1875 14.3952L41.3108 11.1254L43.1007 14.3952L46.1007 10.6919L47.7628 13.8925L50.4249 10.8579L51.9226 14.3952C51.9226 14.3952 52.8176 13.6066 53.8085 12.8087C55.0824 11.7849 55.9683 11.6973 55.9683 11.6973C55.9683 11.6973 55.2012 13.8141 54.8815 19.8556C54.4203 28.5535 58.7354 38.1277 58.2879 46.0785C57.6624 57.2622 51.361 57.2991 51.361 57.2991H31.7856" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.9229 37.4268H16.553" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.2241 40.397H17.1008H17.11" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.81787 43.3667H17.1101" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.4707 46.3369H16.1465" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.1738 35.0518H26.8999H26.9364" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20.1143 38.8149H26.2558H26.2604" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20.6851 42.5737H25.5115H25.5252" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.2969 46.3369H25.0138" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.626 31.293H26.9182" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M29.9453 32.3813H36.5161" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M29.7402 36.4443H37.3704" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M29.2788 40.5029H38.2697" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M29.1279 52.6826H37.6211" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M28.6211 44.561H38.927H38.9499" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M28.3701 48.624H38.6989" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M29.2881 28.3228H35.8497" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M41.4434 36.4673H54.247" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.1919 40.7427H54.9955" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.6943 45.0176H55.498" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.1919 49.293H54.9955" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M40.3608 53.5684H53.1645" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M53 30.4444C53 31.6111 52.2241 32 51.0572 32C49.8904 32 47.7932 32 45.9998 32C44.2064 32 42.1834 32 40.9447 32C39.706 32 39 31.6111 39 30.4444C39 27.3333 42.5005 25 45.9998 25C49.4991 25 53 27.3333 53 30.4444Z" fill="#4ED7DE"/>
+<path d="M49.1125 21.1111C49.1125 22.8293 47.7194 24.2222 46.001 24.2222C44.2825 24.2222 42.8894 22.8293 42.8894 21.1111C42.8894 19.3929 44.2825 18 46.001 18C47.7194 18 49.1125 19.3929 49.1125 21.1111Z" fill="#4ED7DE"/>
+<path d="M53 30.4444C53 31.6111 52.2241 32 51.0572 32C49.8904 32 47.7932 32 45.9998 32C44.2064 32 42.1834 32 40.9447 32C39.706 32 39 31.6111 39 30.4444C39 27.3333 42.5005 25 45.9998 25C49.4991 25 53 27.3333 53 30.4444Z" stroke="#002140"/>
+<path d="M49.1125 21.1111C49.1125 22.8293 47.7194 24.2222 46.001 24.2222C44.2825 24.2222 42.8894 22.8293 42.8894 21.1111C42.8894 19.3929 44.2825 18 46.001 18C47.7194 18 49.1125 19.3929 49.1125 21.1111Z" stroke="#002140"/>
+</svg>
diff --git a/docs/assets/images/gears.svg b/docs/assets/images/gears.svg
new file mode 100644
index 000000000000..23621afc8008
--- /dev/null
+++ b/docs/assets/images/gears.svg
@@ -0,0 +1,101 @@
+<svg width="68" height="68" viewBox="0 0 68 68" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M58.7716 22.5239L62.5675 24.2835C62.1014 27.0923 61.0977 29.3622 59.3662 31.5177H56.3932C58.1246 29.3622 59.1283 27.0923 59.5945 24.2835L55.7986 22.5239C55.8794 21.6751 55.8604 20.9168 55.7605 20.0346C55.6368 18.9903 55.4656 18.1891 55.1041 17.2497L58.5242 15.0322C57.4111 12.3427 55.927 10.397 53.6865 8.67554H56.6595C58.9 10.397 60.3889 12.3427 61.4972 15.0322L58.0771 17.2497C58.4338 18.1891 58.6098 18.9903 58.7335 20.0346C58.8334 20.9168 58.8524 21.6751 58.7716 22.5239Z" fill="#002140"/>
+<path d="M34.1075 13.5065C35.2777 12.0615 36.3623 11.0935 38.0937 10.2923L37.6371 6.38676L37.6228 6.27708C38.7978 5.80021 39.8871 5.47594 41.1571 5.28996C41.3141 5.26611 41.4711 5.24227 41.6328 5.22319C42.9933 5.06583 44.2063 5.09444 45.5001 5.26134L45.971 9.29568C47.8072 9.63426 49.1201 10.2637 50.5899 11.3415L51.8077 10.2923L53.6819 8.67575C55.9223 10.3973 57.4112 12.3429 58.5196 15.0324L55.0994 17.2499C55.4562 18.1893 55.6322 18.9905 55.7558 20.0348C55.8557 20.917 55.8748 21.6753 55.7939 22.5241L59.5898 24.2838C59.1237 27.0925 58.12 29.3624 56.3885 31.5179L54.7426 30.6452L52.7828 29.6104C51.6983 30.9027 50.2427 31.9185 48.692 32.6815L49.1771 36.8159C47.9546 37.2833 46.775 37.5599 45.4145 37.7172C44.4251 37.8317 43.5118 37.8508 42.5937 37.784C42.5176 37.784 42.4462 37.7745 42.3749 37.7697C42.2607 37.7602 42.1466 37.7506 42.0324 37.7363C41.9468 37.7268 41.8659 37.722 41.785 37.7125C41.6138 37.6934 41.4425 37.6695 41.2761 37.6457L40.7956 33.5446C39.3781 33.1965 38.07 32.6767 36.8855 31.9042C36.6144 31.723 36.348 31.5322 36.0864 31.3272L33.1514 34.0882C31.1535 32.362 29.4078 30.216 28.4231 27.6743L30.3449 26.3152L31.8005 25.2852C31.515 24.4554 31.3914 23.8212 31.2867 22.9151C31.1726 21.9232 31.1535 21.1507 31.2677 20.2017L27.4004 18.9333C27.8237 16.4344 29.0272 13.6781 30.4733 11.68L34.1028 13.5208L34.1075 13.5065ZM44.6534 31.1126C49.9668 30.4879 53.7722 25.6667 53.1491 20.34C52.526 15.0134 47.712 11.1984 42.3987 11.8231C37.0853 12.443 33.2798 17.269 33.903 22.5956C34.5261 27.9223 39.34 31.7373 44.6534 31.1126Z" fill="#E4BC07"/>
+<path d="M52.7879 29.6102L54.7477 30.645C53.8391 31.4605 52.7784 32.1329 51.67 32.6765L52.1552 36.811C50.5807 37.7218 47.3841 37.9364 44.7584 37.884C43.9687 37.8697 43.2314 37.8315 42.6035 37.779C43.5216 37.8458 44.4349 37.8267 45.4243 37.7123C46.7848 37.5549 47.9645 37.2783 49.187 36.811L48.7018 32.6765C50.2477 31.9183 51.7033 30.9026 52.7926 29.6055L52.7879 29.6102Z" fill="#002140"/>
+<path d="M45.4432 25.1134C46.9702 24.3075 47.8787 22.5812 47.5743 20.7834C47.3555 19.472 46.5373 18.4133 45.4528 17.8363C44.6821 17.4262 43.7736 17.2593 42.8413 17.4167C40.6008 17.7982 39.1024 19.9202 39.4829 22.1663C39.8587 24.4076 41.9803 25.9097 44.216 25.533C44.6536 25.4567 45.0674 25.3137 45.4432 25.1181V25.1134ZM53.1493 20.3447C53.7724 25.6713 49.9622 30.4973 44.6536 31.1172C39.3402 31.7419 34.5263 27.9269 33.9032 22.6003C33.28 17.2736 37.0902 12.4477 42.3989 11.8277C47.7122 11.203 52.5262 15.018 53.1493 20.3447Z" fill="#E4BC07"/>
+<path d="M51.7413 10.2111L51.8126 10.2969L50.5949 11.3508C49.125 10.2731 47.8122 9.63883 45.976 9.30025L45.5051 5.26592C44.2065 5.09901 42.9935 5.0704 41.6378 5.22777C41.4761 5.24684 41.3143 5.26592 41.1621 5.29453C43.1505 4.93211 45.9808 4.83673 48.4971 5.42328L48.949 9.30025C50.0146 9.49577 50.8993 9.79143 51.7461 10.2111H51.7413Z" fill="#002140"/>
+<path d="M45.4479 17.8317C44.1493 18.5279 43.2645 19.8965 43.2645 21.475C43.2645 23.0534 44.1493 24.422 45.4479 25.1135C45.0721 25.3138 44.6583 25.4568 44.2207 25.5284C41.9849 25.9051 39.8634 24.4029 39.4876 22.1617C39.1071 19.9156 40.6102 17.7935 42.8459 17.412C43.7735 17.2546 44.6868 17.4215 45.4574 17.8317H45.4479Z" fill="#002140"/>
+<path d="M41.7901 37.7028C41.871 37.7124 41.9518 37.7171 42.0375 37.7267C42.1469 37.741 42.2658 37.7505 42.3799 37.7601C42.4513 37.7648 42.5274 37.7744 42.5988 37.7744C43.2219 37.8268 43.964 37.865 44.7536 37.8793V37.946C45.0152 38.6184 45.0628 38.7186 45.2911 39.5102L41.1622 41.5464C41.4428 42.648 41.5332 43.5683 41.5332 44.7605C41.5332 45.762 41.4571 46.6156 41.2526 47.555L45.2816 50.03C44.3921 53.1201 42.6083 55.8526 40.3821 58.0462H36.862C39.0882 55.8478 40.5105 53.4396 41.4 50.3542L37.371 47.8793C37.5708 46.9351 37.6517 46.0862 37.6517 45.0848C37.6517 43.8926 37.5613 42.9723 37.2806 41.8707L41.4096 39.8392C40.5153 36.6776 39.1025 34.298 36.8145 32.0757L36.8906 31.8945C38.075 32.6671 39.3831 33.1869 40.8007 33.535L41.2811 37.6361C41.4524 37.6599 41.6236 37.6838 41.7901 37.7028Z" fill="#002140"/>
+<path d="M32.9945 34.6651L36.8142 32.0804C39.1023 34.3074 40.5151 36.6822 41.4093 39.8439L37.2804 41.8754C37.5611 42.9817 37.6514 43.8973 37.6514 45.0895C37.6514 46.0909 37.5753 46.9445 37.3708 47.8839L41.3998 50.3589C40.5103 53.449 39.088 55.8572 36.8618 58.0508L34.8592 56.6679L33.0659 55.4328C31.6769 56.7442 29.9121 57.6884 28.076 58.3417V63.0389C26.6441 63.3966 25.2837 63.5539 23.7425 63.5539C22.0871 63.5539 20.6363 63.3346 19.1046 62.9245V58.2607C17.8773 57.8029 16.7404 57.2354 15.7082 56.5058C15.1469 56.11 14.6141 55.6617 14.1147 55.161L10.4614 57.8696C8.43976 55.6713 6.77012 53.0389 5.99951 50.0537L10.1047 47.8172C9.89535 46.8491 9.83827 46.1243 9.83827 45.0895C9.83827 43.9641 9.91914 43.0962 10.1712 42.047L5.99951 40.1157C6.80342 37.3689 8.51112 34.4362 10.3901 32.3808L14.2146 34.9226C14.8472 34.3026 15.4513 33.7733 16.0983 33.325C16.9783 32.7051 17.9249 32.2282 19.1046 31.8372V27.2735C20.6553 26.8491 22.0586 26.625 23.7425 26.625C25.2884 26.625 26.6441 26.8157 28.076 27.1734V31.7609C30.0928 32.3808 31.4818 33.2583 32.9898 34.6603L32.9945 34.6651ZM34.6879 45.0942C34.6879 39.038 29.7884 34.1262 23.7472 34.1262C17.7061 34.1262 12.8065 39.038 12.8065 45.0942C12.8065 51.1505 17.7061 56.0623 23.7472 56.0623C29.7884 56.0623 34.6879 51.1505 34.6879 45.0942Z" fill="#8DC8FF"/>
+<path d="M33.1563 34.0786L36.0913 31.3175C36.3529 31.5225 36.6193 31.7133 36.8904 31.8945L36.8143 32.0757L32.9946 34.6603C31.4866 33.2583 30.0976 32.3809 28.0808 31.761V27.1735C26.6489 26.8158 25.2933 26.6251 23.7473 26.6251C22.0634 26.6251 20.6601 26.854 19.1094 27.2736C21.2166 26.1911 26.9772 25.8573 30.3498 26.3056L28.428 27.6646C29.4127 30.2064 31.1537 32.3523 33.1563 34.0738V34.0786Z" fill="#002140"/>
+<path d="M34.8638 56.668C33.9505 57.2164 32.9706 57.6599 31.9621 58.0127V62.7147C30.4161 63.2249 25.2169 63.6494 23.7471 63.554C25.2883 63.554 26.6487 63.3966 28.0805 63.039V58.3418C29.9167 57.6885 31.6815 56.7443 33.0705 55.4329L34.8638 56.668Z" fill="#002140"/>
+<path d="M23.7473 34.1216C29.7885 34.1216 34.688 39.0334 34.688 45.0896C34.688 51.1459 29.7885 56.0577 23.7473 56.0577C17.7062 56.0577 12.8066 51.1459 12.8066 45.0896C12.8066 39.0334 17.7062 34.1216 23.7473 34.1216ZM28.3805 45.0896C28.3805 43.3061 27.3816 41.7611 25.9117 40.979C25.2648 40.6356 24.5275 40.4401 23.7426 40.4401C21.1834 40.4401 19.1047 42.5241 19.1047 45.0896C19.1047 47.6552 21.1834 49.7391 23.7426 49.7391C24.5275 49.7391 25.2648 49.5436 25.9117 49.2003C27.3768 48.423 28.3805 46.8731 28.3805 45.0896Z" fill="#8DC8FF"/>
+<path d="M25.9115 40.9837C24.4417 41.761 23.4427 43.3108 23.4427 45.0943C23.4427 46.8778 24.4417 48.4229 25.9115 49.205C25.2646 49.5483 24.5273 49.7438 23.7424 49.7438C21.1832 49.7438 19.1045 47.6599 19.1045 45.0943C19.1045 42.5288 21.1832 40.4448 23.7424 40.4448C24.5273 40.4448 25.2646 40.6403 25.9115 40.9837Z" fill="#002140"/>
+<path d="M16.0319 33.225L16.1032 33.3251C15.461 33.7734 14.8522 34.3027 14.2195 34.9227L10.395 32.3809L14.2623 32.0471L16.0271 33.2202L16.0319 33.225Z" fill="#002140"/>
+<path d="M15.7127 56.5059L15.6747 56.5631L14.338 57.555L10.4707 57.8698L14.1239 55.1611C14.6234 55.6618 15.1562 56.1101 15.7175 56.5059H15.7127Z" fill="#002140"/>
+<path d="M25.9115 40.9837C27.3766 41.761 28.3803 43.3108 28.3803 45.0943C28.3803 46.8778 27.3814 48.4229 25.9115 49.205C25.2646 49.5483 24.5273 49.7438 23.7424 49.7438C21.1832 49.7438 19.1045 47.6599 19.1045 45.0943C19.1045 42.5288 21.1832 40.4448 23.7424 40.4448C24.5273 40.4448 25.2646 40.6403 25.9115 40.9837Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M25.9117 49.2003C24.4418 48.423 23.4429 46.8731 23.4429 45.0896C23.4429 43.3061 24.4418 41.7611 25.9117 40.979" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M34.688 45.0896C34.688 51.1459 29.7885 56.0577 23.7473 56.0577C17.7062 56.0577 12.8066 51.1459 12.8066 45.0896C12.8066 39.0334 17.7062 34.1216 23.7473 34.1216C29.7885 34.1216 34.688 39.0334 34.688 45.0896Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.1048 47.8173C9.89546 46.8492 9.83838 46.1244 9.83838 45.0896C9.83838 43.9641 9.91925 43.0962 10.1714 42.0471" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.1095 58.2608C17.8823 57.803 16.7454 57.2355 15.7132 56.5059C15.1519 56.1101 14.6191 55.6618 14.1196 55.1611" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M33.0705 55.4329C31.6815 56.7443 29.9167 57.6885 28.0806 58.3418" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M37.2803 41.8755C37.5609 42.9818 37.6513 43.8974 37.6513 45.0896C37.6513 46.091 37.5752 46.9446 37.3707 47.8841" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M28.0806 31.761C30.0975 32.3809 31.4865 33.2584 32.9944 34.6604" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.2192 34.9228C14.8519 34.3028 15.456 33.7735 16.1029 33.3252C16.983 32.7053 17.9296 32.2284 19.1093 31.8374" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.00439 40.1157C6.8083 37.3689 8.516 34.4362 10.3949 32.3809" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.4614 57.865C8.43976 55.6666 6.77012 53.0343 5.99951 50.0491" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M28.0808 63.039C26.6489 63.3967 25.2885 63.554 23.7473 63.554C22.0919 63.554 20.6411 63.3347 19.1094 62.9246" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M41.4047 50.3589C40.5152 53.449 39.0929 55.8572 36.8667 58.0508" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M36.8145 32.0806C39.1025 34.3076 40.5153 36.6824 41.4096 39.844" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.1094 27.2735C20.6601 26.8491 22.0634 26.625 23.7473 26.625C25.2933 26.625 26.6489 26.8157 28.0808 27.1734" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M28.0806 31.7609V27.3499" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.1094 27.4023V31.8373" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.1094 58.2607V62.9245" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M28.0806 63.039V58.3418" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M33.0708 55.4329L34.8641 56.668L36.8667 58.0509" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M37.3755 47.8889L41.4045 50.3591" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M37.2803 41.8755L41.4092 39.844" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M32.9849 34.67L32.9944 34.6652L36.8141 32.0806" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.3955 32.3816L10.3901 32.3762" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.2239 34.9274L14.2191 34.9226L10.3994 32.3809" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.1714 42.0471L6.00439 40.1157" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.99951 50.0539L10.1047 47.8174" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.4663 57.8649L14.1196 55.1562H14.1243" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.4517 57.8745L10.4612 57.865" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M34.8641 56.6729C33.9508 57.2165 32.9708 57.6647 31.9624 58.0176" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M41.1621 41.5513C41.4428 42.6528 41.5331 43.5732 41.5331 44.7654C41.5331 45.7668 41.457 46.6204 41.2525 47.5599" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M31.9621 62.7195C30.4161 63.2297 25.2169 63.6542 23.7471 63.5588" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M45.2862 50.0396C44.3967 53.1297 42.6129 55.8622 40.3867 58.0558" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M44.7583 37.9507C45.0199 38.6231 45.0675 38.7232 45.2958 39.5148" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.1094 27.2736C21.2166 26.1911 26.9772 25.8573 30.3498 26.3056" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M31.9624 62.7195V58.0176" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M41.2573 47.5598L45.2864 50.0395" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M41.1621 41.5511L45.291 39.5149" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16.0319 33.2251L14.2671 32.052" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M14.3384 57.5502L15.675 56.5583" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.4614 57.865H10.4662L14.3382 57.5503" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.395 32.381H10.3998L14.2671 32.052" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M36.8667 58.051H40.3868" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M45.4477 17.8315C46.5322 18.4133 47.3504 19.472 47.5692 20.7786C47.8736 22.5764 46.9699 24.3027 45.4382 25.1086C45.0624 25.3089 44.6485 25.452 44.2109 25.5235C41.9752 25.9002 39.8536 24.3981 39.4778 22.1568C39.0973 19.9107 40.6005 17.7886 42.8362 17.4071C43.7638 17.2498 44.6771 17.4167 45.4477 17.8268V17.8315Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M45.448 25.1135C44.1494 24.422 43.2646 23.0582 43.2646 21.475C43.2646 19.8917 44.1494 18.5279 45.448 17.8364" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M53.1493 20.34C53.7724 25.6667 49.9622 30.4926 44.6536 31.1125C39.3402 31.7372 34.5263 27.9223 33.9032 22.5956C33.28 17.269 37.0902 12.443 42.3989 11.8231C47.7122 11.1984 52.5262 15.0134 53.1493 20.34Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M31.8053 25.2756C31.5199 24.4458 31.3962 23.8116 31.2915 22.9055C31.1774 21.9136 31.1583 21.1411 31.2725 20.1921" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M40.8006 33.5348C39.383 33.1867 38.0749 32.6669 36.8905 31.8944C36.6193 31.7132 36.3529 31.5224 36.0913 31.3174" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M52.7876 29.6104C51.7031 30.9027 50.2475 31.9184 48.6968 32.6814" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M55.104 17.2498C55.4608 18.1892 55.6368 18.9903 55.7604 20.0347C55.8603 20.9169 55.8794 21.6751 55.7985 22.524" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M45.9712 9.29565C47.8073 9.63423 49.1202 10.2637 50.5901 11.3414" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M34.1074 13.5064C35.2776 12.0614 36.3622 11.0934 38.0936 10.2922" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M27.4102 18.9236C27.8335 16.4248 29.037 13.6685 30.4831 11.6704" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M33.156 34.0786C31.1582 32.3571 29.4124 30.2064 28.4277 27.6694" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M41.7897 37.7027C41.6185 37.6837 41.4473 37.6598 41.2808 37.636" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.3796 37.7648C42.2654 37.7553 42.1513 37.7458 42.0371 37.7314" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M49.1821 36.811C47.9596 37.2784 46.7799 37.555 45.4194 37.7123C44.43 37.8268 43.5167 37.8458 42.5986 37.7791" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M59.5993 24.2837C59.1331 27.0925 58.1294 29.3624 56.3979 31.5178" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M53.6865 8.67554C55.927 10.397 57.4159 12.3427 58.5242 15.0322" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M37.623 6.27708C38.798 5.80021 39.8873 5.47594 41.1574 5.28996C41.3143 5.26611 41.4713 5.24227 41.6331 5.22319C42.9935 5.06583 44.2065 5.09444 45.5004 5.26134" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M45.9709 9.29557L45.5 5.26123" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M37.6323 6.38672L38.089 10.2923" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M40.8003 33.5349L41.2807 37.636" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M49.1821 36.811L48.7017 32.6765" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M52.7876 29.6104L54.7474 30.6452L56.3933 31.5178" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M55.8037 22.5239L59.5997 24.2836" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M55.104 17.2497L58.5242 15.0322" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M54.7476 30.645C53.839 31.4605 52.7783 32.1329 51.6699 32.6765" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M58.0771 17.2498C58.4339 18.1892 58.6099 18.9903 58.7336 20.0347C58.8335 20.9169 58.8525 21.6751 58.7716 22.524" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M48.9443 9.29565C50.0099 9.49117 50.8946 9.78683 51.7414 10.2065" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M62.5724 24.2837C62.1063 27.0925 61.1026 29.3624 59.3711 31.5178" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M56.6597 8.67554C58.9001 10.397 60.389 12.3427 61.4974 15.0322" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M48.9441 9.29567L48.4922 5.4187" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M52.1551 36.811L51.6699 32.6765" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M58.772 22.5239L62.5727 24.2836" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M58.0771 17.2497L61.4973 15.0322" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M50.5854 11.3508L50.595 11.346L51.8127 10.2921L53.6869 8.67554" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M34.1126 13.5112L34.1078 13.5064L30.4784 11.6657L30.4736 11.6609" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M31.2775 20.1921L27.4102 18.9236" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M28.4277 27.6648L30.3495 26.3057H30.3542L31.8051 25.2756" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M33.1465 34.0881L33.156 34.0786L36.091 31.3175L36.0957 31.3127" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M48.4923 5.4186C45.9711 4.83682 43.1456 4.92742 41.1572 5.28984" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M52.1552 36.811C50.5806 37.7219 47.3841 37.9365 44.7583 37.884C43.9687 37.8697 43.2313 37.8315 42.6034 37.7791C42.5273 37.7791 42.456 37.7695 42.3846 37.7648C42.2657 37.7505 42.1515 37.7409 42.0421 37.7314C41.9565 37.7219 41.8756 37.7171 41.7948 37.7076C41.7377 37.698 41.6759 37.6932 41.6235 37.6837" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M59.371 31.5178H56.3979" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M53.6865 8.67554H56.6595" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/docs/assets/images/hand-card.svg b/docs/assets/images/hand-card.svg
new file mode 100644
index 000000000000..779e6ff4184c
--- /dev/null
+++ b/docs/assets/images/hand-card.svg
@@ -0,0 +1,19 @@
+<svg width="69" height="68" viewBox="0 0 69 68" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M56.4219 40.9701L32.6205 24.7825C31.4769 24.0048 29.9193 24.3013 29.1415 25.4449L20.7593 37.7697C19.9816 38.9133 20.2781 40.4708 21.4217 41.2486L45.2232 57.4362C46.3668 58.214 47.9243 57.9174 48.7021 56.7738L57.0843 44.449C57.862 43.3055 57.5655 41.7479 56.4219 40.9701Z" fill="#008C59"/>
+<path d="M27.5959 27.6191C27.5959 27.6191 28.5283 27.7423 29.524 27.6823C30.5197 27.6224 31.9483 27.1862 31.9483 27.1862C31.9483 27.1862 32.4444 32.8472 33.1304 33.5298C33.8164 34.2125 36.1773 35.954 38.3552 34.7752C40.533 33.5931 41.502 33.4133 41.0924 31.9148C40.6828 30.4163 37.6093 24.5754 37.6093 24.5754C37.6093 24.5754 37.546 21.342 37.546 20.7193C37.546 20.0966 38.2286 15.4945 34.3725 14.6853C30.5164 13.8762 27.5926 14.0027 25.0418 13.1302C22.4911 12.2611 20.3166 10.02 20.3166 10.02C20.3166 10.02 10.6762 13.8762 10.4897 22.1479C10.4897 22.1479 14.1594 25.6943 15.5913 28.2418C17.0232 30.7892 18.8247 36.9497 21.1258 37.0729L27.5926 27.6191H27.5959Z" fill="#E3A171"/>
+<path d="M38.415 52.9971L22.6175 42.4243C22.6175 42.4243 18.0155 46.3437 20.0667 48.4583C22.118 50.5728 25.5413 48.2085 25.5413 48.2085C25.5413 48.2085 24.1094 51.1323 25.5413 52.3144C26.9732 53.4966 30.6428 51.8782 30.6428 51.8782C30.6428 51.8782 29.151 54.8652 31.3887 55.9841C33.6265 57.1029 37.2362 54.3657 38.4184 52.9971H38.415Z" fill="#E3A171"/>
+<path d="M40.6796 30.4129L56.3172 41.0489C57.4727 41.8348 57.7724 43.4066 56.9866 44.5621L48.6383 56.8365C47.8524 57.992 46.2806 58.2917 45.1251 57.5058L21.2057 41.2354C20.0502 40.4495 19.7505 38.8778 20.5364 37.7223L27.606 27.3293" stroke="#002140" stroke-width="0.998999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M31.9637 35.571L31.6388 35.35C31.3742 35.1701 31.0138 35.2387 30.8338 35.5033L30.2439 36.3706C30.064 36.6352 30.1326 36.9956 30.3972 37.1756L30.7221 37.3966C30.9867 37.5765 31.3471 37.5079 31.5271 37.2433L32.117 36.376C32.2969 36.1114 32.2283 35.751 31.9637 35.571Z" fill="#085239"/>
+<path d="M33.2288 33.7499L32.9039 33.529C32.6393 33.349 32.2789 33.4176 32.099 33.6822L31.7188 34.2412C31.5388 34.5058 31.6075 34.8662 31.8721 35.0462L32.197 35.2671C32.4616 35.4471 32.822 35.3785 33.0019 35.1139L33.3821 34.5549C33.5621 34.2903 33.4934 33.9299 33.2288 33.7499Z" fill="#085239"/>
+<path d="M33.4105 36.9829L33.0856 36.7619C32.821 36.5819 32.4606 36.6505 32.2806 36.9151L31.9004 37.4741C31.7205 37.7387 31.7891 38.0991 32.0537 38.2791L32.3786 38.5001C32.6432 38.68 33.0036 38.6114 33.1836 38.3468L33.5637 37.7878C33.7437 37.5232 33.6751 37.1628 33.4105 36.9829Z" fill="#085239"/>
+<path d="M34.8138 34.8313L34.4889 34.6103C34.2243 34.4303 33.8639 34.4989 33.6839 34.7635L33.0397 35.7107C32.8597 35.9754 32.9284 36.3357 33.193 36.5157L33.5179 36.7367C33.7825 36.9167 34.1429 36.848 34.3229 36.5834L34.9671 35.6362C35.147 35.3716 35.0784 35.0112 34.8138 34.8313Z" fill="#085239"/>
+<path d="M53.0311 41.7588L44.7788 36.1463C43.7462 35.4441 42.3399 35.7118 41.6376 36.7444C40.9354 37.777 41.2031 39.1833 42.2357 39.8856L50.488 45.4981C51.5206 46.2003 52.9269 45.9326 53.6292 44.9C54.3315 43.8674 54.0637 42.4611 53.0311 41.7588Z" fill="#03D47C"/>
+<path d="M20.1831 10C20.1831 10 10.8625 13.7063 10.333 21.9713C16.3803 26.7565 17.276 34.0759 20.8791 37.1228" stroke="#002140" stroke-width="0.998999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M22.7106 42.261C19.9434 44.289 18.4449 47.7788 20.8758 48.9709C22.694 49.86 24.8751 48.608 26.2771 47.4491" stroke="#002140" stroke-width="0.998999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M27.912 45.9441C24.925 48.4083 23.5331 51.4353 25.964 52.6241C27.5524 53.4033 29.4238 52.5408 30.8058 51.5385" stroke="#002140" stroke-width="0.998999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M32.9701 49.3206C29.8699 52.1377 28.7743 54.9283 31.2052 56.1171C33.0234 57.0062 35.401 56.3069 38.3714 52.9103" stroke="#002140" stroke-width="0.998999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M24.0127 38.9775L28.9511 42.3375" stroke="#002140" stroke-width="0.998999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M31.2119 43.876L36.1503 47.2326" stroke="#002140" stroke-width="0.998999" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M29.4937 36.1637L32.231 32.1378C32.3742 31.928 32.3176 31.6449 32.1111 31.5017L30.7358 30.566C30.6193 30.4861 30.4727 30.4661 30.3362 30.5094L29.4571 30.7925C29.3605 30.8224 29.2773 30.8857 29.2173 30.9723L27.2293 33.896C27.1761 33.9726 27.1494 34.0658 27.1494 34.1591L27.1561 34.9017C27.1561 35.0515 27.2327 35.1914 27.3592 35.278L28.8577 36.287C29.0675 36.4268 29.3505 36.3735 29.4937 36.1637Z" fill="#085239"/>
+<path d="M25.5114 26.2104C25.5114 26.2104 29.3775 29.1508 32.0781 26.8465C31.4421 32.2477 34.1694 36.8298 38.9646 34.5787C43.7564 32.3276 37.879 26.6866 37.4827 23.7462C37.0865 20.8058 38.6749 18.345 36.0541 15.8009C33.4334 13.2567 24.6656 15.0849 20.3232 10" stroke="#002140" stroke-width="0.998999" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/docs/assets/images/money-into-wallet.svg b/docs/assets/images/money-into-wallet.svg
new file mode 100644
index 000000000000..d6d5b0e7d6e7
--- /dev/null
+++ b/docs/assets/images/money-into-wallet.svg
@@ -0,0 +1,32 @@
+<svg width="68" height="68" viewBox="0 0 68 68" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.55273 34.1149L22.9267 21.7931L25.275 21.4395V24.0212C25.275 24.0212 21.1689 34.2316 20.5819 34.2316C19.9948 34.2316 7.55626 34.1149 7.55626 34.1149H7.55273Z" fill="#712B02"/>
+<path d="M6.49854 34.2311L22.2191 22.1711C23.2801 21.3576 24.6594 21.1879 25.8512 21.6476" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.5589 12.1025L18.032 12.9124C18.032 12.9124 16.4865 18.6949 18.1275 21.9451C19.7685 25.1953 22.1629 28.7037 21.8481 30.7833C21.5333 32.8628 20.7482 37.6409 20.7482 37.6409L32.6526 37.0962C32.6526 37.0962 35.4042 32.2298 34.3998 28.831C33.3953 25.4323 27.8357 18.465 30.5589 12.1025Z" fill="#06CD7C"/>
+<path d="M32.1909 34.9256C32.8149 34.1044 32.853 33.0833 32.276 32.6449C31.699 32.2065 30.7254 32.5167 30.1015 33.3379C29.4775 34.159 29.4394 35.1801 30.0164 35.6186C30.5934 36.057 31.5669 35.7467 32.1909 34.9256Z" fill="#0B4F38"/>
+<path d="M25.4692 35.5335C26.0932 34.7123 26.1313 33.6913 25.5543 33.2528C24.9773 32.8144 24.0037 33.1246 23.3798 33.9458C22.7558 34.7669 22.7177 35.788 23.2947 36.2265C23.8717 36.6649 24.8453 36.3546 25.4692 35.5335Z" fill="#0B4F38"/>
+<path d="M21.0879 16.6067C21.7118 15.7856 21.7499 14.7645 21.1729 14.3261C20.596 13.8876 19.6224 14.1979 18.9984 15.019C18.3745 15.8402 18.3364 16.8613 18.9134 17.2997C19.4904 17.7381 20.4639 17.4279 21.0879 16.6067Z" fill="#0B4F38"/>
+<path d="M27.9409 16.0706C28.5649 15.2494 28.603 14.2284 28.026 13.7899C27.449 13.3515 26.4754 13.6618 25.8515 14.4829C25.2275 15.3041 25.1894 16.3251 25.7664 16.7636C26.3434 17.202 27.3169 16.8917 27.9409 16.0706Z" fill="#0B4F38"/>
+<path d="M28.6384 31.2116C30.5223 30.4208 30.882 26.9985 29.4419 23.5675C28.0018 20.1365 25.3071 17.9962 23.4233 18.787C21.5394 19.5777 21.1797 23.0001 22.6198 26.431C24.0599 29.862 26.7546 32.0023 28.6384 31.2116Z" fill="#0B4F38"/>
+<path d="M21.8197 33.255C22.8347 25.3435 13.6995 20.622 18.3184 12.6044L30.9868 11.9536C25.5403 21.4107 39.2308 26.2842 32.8188 37.2196L20.1504 37.8704C21.1265 36.2046 21.6393 34.6768 21.8197 33.255" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M48.0756 26.1113L39.8493 16.626C39.8493 16.626 34.3109 18.893 32.7158 22.1644C31.1208 25.4394 29.7768 29.4677 27.9307 30.4721C26.0846 31.48 21.8052 33.747 21.8052 33.747L29.4444 42.8964C29.4444 42.8964 34.9828 42.1396 37.0836 39.289C39.1809 36.4349 41.363 27.7913 48.0792 26.1113H48.0756Z" fill="#06CD7C"/>
+<path d="M30.5373 40.3215C31.5686 40.3215 32.4047 39.734 32.4047 39.0094C32.4047 38.2847 31.5686 37.6973 30.5373 37.6973C29.506 37.6973 28.6699 38.2847 28.6699 39.0094C28.6699 39.734 29.506 40.3215 30.5373 40.3215Z" fill="#0B4F38"/>
+<path d="M38.7599 21.298C39.7913 21.298 40.6273 20.7106 40.6273 19.9859C40.6273 19.2613 39.7913 18.6738 38.7599 18.6738C37.7286 18.6738 36.8926 19.2613 36.8926 19.9859C36.8926 20.7106 37.7286 21.298 38.7599 21.298Z" fill="#0B4F38"/>
+<path d="M43.3293 26.4294C44.3606 26.4294 45.1966 25.8419 45.1966 25.1173C45.1966 24.3926 44.3606 23.8052 43.3293 23.8052C42.298 23.8052 41.4619 24.3926 41.4619 25.1173C41.4619 25.8419 42.298 26.4294 43.3293 26.4294Z" fill="#0B4F38"/>
+<path d="M38.2674 32.1605C40.1279 28.9381 40.2017 25.4977 38.4323 24.4761C36.6629 23.4546 33.7204 25.2387 31.8599 28.4612C29.9994 31.6836 29.9256 35.124 31.695 36.1456C33.4643 37.1671 36.4069 35.383 38.2674 32.1605Z" fill="#0B4F38"/>
+<path d="M24.1395 35.9998C24.9892 35.9998 25.678 35.311 25.678 34.4613C25.678 33.6116 24.9892 32.9229 24.1395 32.9229C23.2899 32.9229 22.6011 33.6116 22.6011 34.4613C22.6011 35.311 23.2899 35.9998 24.1395 35.9998Z" fill="#0B4F38"/>
+<path d="M29.8832 38.4578C30.7328 38.4578 31.4216 37.769 31.4216 36.9193C31.4216 36.0697 30.7328 35.3809 29.8832 35.3809C29.0335 35.3809 28.3447 36.0697 28.3447 36.9193C28.3447 37.769 29.0335 38.4578 29.8832 38.4578Z" fill="#0B4F38"/>
+<path d="M8.11149 33.5273C8.11149 33.5273 6.23352 33.881 6.11681 35.0517C6.0001 36.2223 6.11681 57.8172 6.11681 57.8172C6.11681 57.8172 7.87807 59.3416 8.69858 59.3416H47.0715C47.0715 59.3416 48.7161 57.934 48.7161 56.4096V35.4053C48.7161 35.4053 48.129 33.5273 46.7214 33.5273H8.11503H8.11149Z" fill="#712B02"/>
+<path d="M6.23342 38.4541H41.6709C41.6709 38.4541 44.9565 38.5708 44.9565 41.1526V52.7706C44.9565 52.7706 44.2527 54.7653 40.1466 54.7653H6L6.23342 38.4541Z" fill="#C88000"/>
+<path d="M38.5872 49.4253C40.013 49.4253 41.1689 48.2694 41.1689 46.8435C41.1689 45.4176 40.013 44.2617 38.5872 44.2617C37.1613 44.2617 36.0054 45.4176 36.0054 46.8435C36.0054 48.2694 37.1613 49.4253 38.5872 49.4253Z" fill="#F6DC5E"/>
+<path d="M46.5475 33.4429H8.11092C6.95264 33.4429 6.01367 34.3818 6.01367 35.5401V57.0502C6.01367 58.2085 6.95264 59.1474 8.11092 59.1474H46.5475C47.7058 59.1474 48.6448 58.2085 48.6448 57.0502V35.5401C48.6448 34.3818 47.7058 33.4429 46.5475 33.4429Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.43455 38.3374H41.193C43.3398 38.3374 45.0763 40.0279 45.0763 42.111V50.9881C45.0763 53.0712 43.3362 54.7617 41.193 54.7617H6.27539" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M38.587 49.5807C40.0988 49.5807 41.3244 48.3552 41.3244 46.8433C41.3244 45.3315 40.0988 44.106 38.587 44.106C37.0752 44.106 35.8496 45.3315 35.8496 46.8433C35.8496 48.3552 37.0752 49.5807 38.587 49.5807Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M21.8403 33.3333C33.713 31.4695 29.6139 18.0336 40.27 16.6685L48.4538 26.3625C43.6404 26.9779 41.8367 30.0583 40.2134 33.4217" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M66.8058 20.5056L61.766 9.00781C61.766 9.00781 55.8032 9.5277 53.3098 12.1802C50.8165 14.8327 48.3373 18.281 46.2754 18.6948C44.2135 19.1086 39.4531 19.9998 39.4531 19.9998L44.0296 31.0024C44.0296 31.0024 49.5433 31.9255 52.3938 29.8247C55.2444 27.7239 59.8951 20.1165 66.8058 20.5056Z" fill="#06CD7C"/>
+<path d="M48.077 29.1278C48.2921 28.4358 47.6682 27.6266 46.6833 27.3204C45.6985 27.0143 44.7258 27.327 44.5106 28.019C44.2955 28.711 44.9194 29.5202 45.9043 29.8263C46.8891 30.1325 47.8618 29.8198 48.077 29.1278Z" fill="#0B4F38"/>
+<path d="M45.2064 23.0179C45.4215 22.3259 44.7975 21.5168 43.8127 21.2106C42.8279 20.9044 41.8552 21.2172 41.64 21.9092C41.4249 22.6011 42.0488 23.4103 43.0337 23.7165C44.0185 24.0227 44.9912 23.7099 45.2064 23.0179Z" fill="#0B4F38"/>
+<path d="M61.5023 12.4393C61.7174 11.7473 61.0935 10.9381 60.1086 10.632C59.1238 10.3258 58.151 10.6386 57.9359 11.3305C57.7208 12.0225 58.3447 12.8317 59.3296 13.1379C60.3144 13.444 61.2871 13.1313 61.5023 12.4393Z" fill="#0B4F38"/>
+<path d="M64.3441 18.6966C64.5592 18.0046 63.9352 17.1955 62.9504 16.8893C61.9656 16.5831 60.9928 16.8959 60.7777 17.5879C60.5626 18.2799 61.1865 19.089 62.1714 19.3952C63.1562 19.7014 64.1289 19.3886 64.3441 18.6966Z" fill="#0B4F38"/>
+<path d="M55.6442 23.3612C58.3774 20.8364 59.4693 17.573 58.083 16.0722C56.6967 14.5715 53.3571 15.4016 50.6238 17.9264C47.8906 20.4513 46.7987 23.7147 48.185 25.2154C49.5713 26.7162 52.9109 25.8861 55.6442 23.3612Z" fill="#0B4F38"/>
+<path d="M67.0923 20.8592C56.3408 18.9671 56.4363 33.4993 43.966 31.204L39.0288 19.5153C51.4991 21.8106 51.4036 7.27835 62.1551 9.17047L67.0923 20.8592Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/docs/assets/images/money-receipt.svg b/docs/assets/images/money-receipt.svg
new file mode 100644
index 000000000000..379d56727e42
--- /dev/null
+++ b/docs/assets/images/money-receipt.svg
@@ -0,0 +1,34 @@
+<svg width="68" height="68" viewBox="0 0 68 68" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M58.3966 47.3367L62.5266 46.01L35.54 25.88C35.54 25.88 33.6233 22.12 33.3266 20.4234C33.03 18.7267 33.0333 17.77 33.0333 17.77L30.3066 22.0467L26.7666 19.17L24.9233 23.74L21.31 21.2334L19.3933 24.8467L15.6333 22.7834L13.7166 26.25L10.4 24.3334L8.7033 27.5034L5.5333 26.62C5.5333 26.62 5.45997 32.37 9.36663 35.7634C13.2733 39.1567 35.0266 54.9334 35.0266 54.9334L58.4 47.34L58.3966 47.3367Z" fill="#FFFAF0"/>
+<path d="M8.03707 32.3291C6.56551 31.0988 3.77969 27.3867 4.01388 21.6263L8.03707 23.8738L9.76728 20.2876L13.378 22.4582L15.0838 18.6237L19.093 21.0076L20.977 16.8306L24.7485 19.1725L26.8073 15.1004C26.8073 15.1004 29.9951 17.3305 30.3446 17.4912C30.6522 15.3661 33.2423 12 33.2423 12" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M37.4332 23.1503C36.2168 22.3393 34.1685 20.5427 33.2388 12" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M36.86 22.7239L64.4001 43.2173L35.5772 52.8261L8.03711 32.3292" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M25.8532 28.3096L5.76172 40.3861L37.6361 55.8776L58.0317 43.4411L25.8532 28.3096Z" fill="#02B368"/>
+<path d="M26.145 34.4985C27.5163 34.1997 28.4667 33.2175 28.2678 32.3046C28.0689 31.3917 26.7961 30.8938 25.4248 31.1925C24.0535 31.4912 23.1031 32.4735 23.302 33.3864C23.5009 34.2993 24.7737 34.7972 26.145 34.4985Z" fill="#FED604"/>
+<path d="M15.4157 41.1697C16.6587 40.8989 17.5052 39.9393 17.3063 39.0264C17.1074 38.1134 15.9385 37.5929 14.6955 37.8637C13.4525 38.1345 12.6061 39.0941 12.8049 40.007C13.0038 40.9199 14.1727 41.4405 15.4157 41.1697Z" fill="#FED604"/>
+<path d="M48.9597 45.9583C50.2027 45.6875 51.0491 44.7279 50.8502 43.8149C50.6513 42.902 49.4824 42.3815 48.2394 42.6523C46.9964 42.9231 46.15 43.8826 46.3489 44.7956C46.5478 45.7085 47.7166 46.229 48.9597 45.9583Z" fill="#FED604"/>
+<path d="M57.815 43.7766L25.647 28.0264L5.42969 40.4L37.7759 55.8461L57.815 43.7766Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M15.4419 41.2798C16.8792 40.9667 17.8541 39.8398 17.6195 38.7628C17.3848 37.6857 16.0295 37.0665 14.5922 37.3796C13.1549 37.6927 12.18 38.8196 12.4146 39.8967C12.6492 40.9737 14.0046 41.5929 15.4419 41.2798Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M48.8349 46.199C50.2722 45.8859 51.2472 44.759 51.0125 43.6819C50.7779 42.6049 49.4225 41.9857 47.9853 42.2988C46.548 42.6119 45.573 43.7388 45.8077 44.8158C46.0423 45.8929 47.3976 46.5121 48.8349 46.199Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M26.1513 34.7117C27.5886 34.3986 28.5636 33.2717 28.3289 32.1946C28.0943 31.1176 26.7389 30.4984 25.3017 30.8115C23.8644 31.1246 22.8894 32.2515 23.1241 33.3285C23.3587 34.4056 24.7141 35.0248 26.1513 34.7117Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M32.3125 23.2341L10.1099 30.7597L37.9541 52.6792L60.5342 44.8705L32.3125 23.2341Z" fill="#02B368"/>
+<path d="M31.278 29.3476C32.6814 29.3476 33.8191 28.5902 33.8191 27.6559C33.8191 26.7215 32.6814 25.9641 31.278 25.9641C29.8745 25.9641 28.7368 26.7215 28.7368 27.6559C28.7368 28.5902 29.8745 29.3476 31.278 29.3476Z" fill="#FED604"/>
+<path d="M19.3762 33.5806C20.6484 33.5806 21.6797 32.8231 21.6797 31.8888C21.6797 30.9544 20.6484 30.197 19.3762 30.197C18.104 30.197 17.0728 30.9544 17.0728 31.8888C17.0728 32.8231 18.104 33.5806 19.3762 33.5806Z" fill="#FED604"/>
+<path d="M39.2717 49.1977C40.5439 49.1977 41.5752 48.4403 41.5752 47.506C41.5752 46.5716 40.5439 45.8142 39.2717 45.8142C37.9996 45.8142 36.9683 46.5716 36.9683 47.506C36.9683 48.4403 37.9996 49.1977 39.2717 49.1977Z" fill="#FED604"/>
+<path d="M51.1316 45.3984C52.4037 45.3984 53.435 44.641 53.435 43.7067C53.435 42.7723 52.4037 42.0149 51.1316 42.0149C49.8594 42.0149 48.8281 42.7723 48.8281 43.7067C48.8281 44.641 49.8594 45.3984 51.1316 45.3984Z" fill="#FED604"/>
+<path d="M39.5551 35.2757C39.5551 35.2757 33.0642 30.9484 29.9603 32.455C26.8564 33.9615 29.4779 38.9424 31.0893 40.1693C32.7007 41.3961 37.769 44.2134 40.7785 42.8048C43.788 41.3961 41.0616 36.0307 39.5551 35.2792V35.2757Z" fill="#FED604"/>
+<path d="M60.2511 45.1536L32.1727 22.916L9.78125 30.7037L38.1008 52.6792L60.2511 45.1536Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.3793 33.6958C20.8503 33.6958 22.0428 32.8022 22.0428 31.7C22.0428 30.5977 20.8503 29.7041 19.3793 29.7041C17.9083 29.7041 16.7158 30.5977 16.7158 31.7C16.7158 32.8022 17.9083 33.6958 19.3793 33.6958Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M39.2719 49.502C40.7429 49.502 41.9354 48.6084 41.9354 47.5061C41.9354 46.4038 40.7429 45.5103 39.2719 45.5103C37.8009 45.5103 36.6084 46.4038 36.6084 47.5061C36.6084 48.6084 37.8009 49.502 39.2719 49.502Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M50.9569 45.6079C52.4279 45.6079 53.6204 44.7144 53.6204 43.6121C53.6204 42.5098 52.4279 41.6162 50.9569 41.6162C49.4859 41.6162 48.2935 42.5098 48.2935 43.6121C48.2935 44.7144 49.4859 45.6079 50.9569 45.6079Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M31.2397 29.5572C32.7107 29.5572 33.9031 28.6636 33.9031 27.5613C33.9031 26.459 32.7107 25.5654 31.2397 25.5654C29.7687 25.5654 28.5762 26.459 28.5762 27.5613C28.5762 28.6636 29.7687 29.5572 31.2397 29.5572Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M41.78 41.8242C43.1151 39.7244 41.2156 36.1261 37.5372 33.7873C33.8589 31.4484 29.7947 31.2546 28.4595 33.3544C27.1243 35.4543 29.0239 39.0525 32.7022 41.3914C36.3806 43.7302 40.4448 43.924 41.78 41.8242Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M33.6685 30.6338C33.6685 30.6338 35.0491 33.465 44.4203 33.1749C53.7914 32.8848 54.8784 31.0672 54.8784 30.487C54.8784 29.9067 50.5931 27.9458 44.9271 28.0157C39.2611 28.0856 33.8852 28.7428 33.6685 30.6303V30.6338Z" fill="#FED604"/>
+<path d="M34.4551 29.7668C35.3639 30.4065 36.5628 30.4694 37.6603 30.3051C38.7579 30.1408 39.8205 29.7738 40.925 29.6375C42.2008 29.4802 43.4906 29.634 44.7734 29.634C45.2908 29.634 45.8291 29.6026 46.2904 29.3649C46.7518 29.1272 47.1154 28.6308 47.0489 28.117C47.0489 28.117 43.1586 27.9772 40.1945 28.2044C37.2269 28.4316 34.4551 29.7633 34.4551 29.7633V29.7668Z" fill="#FFED8F"/>
+<path d="M33.8149 31.144V34.2689C33.8149 34.2689 37.7368 36.3766 44.7834 36.3766C51.8301 36.3766 54.9515 34.1256 54.9515 34.1256V31.0007C54.9515 31.0007 51.6833 33.472 44.4199 33.1784C37.1565 32.8847 34.6853 31.7243 33.8149 31.144Z" fill="#D08000"/>
+<path d="M44.3472 33.056C50.2041 33.056 54.9522 31.9496 54.9522 30.5848C54.9522 29.2199 50.2041 28.1135 44.3472 28.1135C38.4902 28.1135 33.7422 29.2199 33.7422 30.5848C33.7422 31.9496 38.4902 33.056 44.3472 33.056Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M33.7422 30.5847V33.8284C33.7422 35.1916 38.4889 36.2997 44.3472 36.2997C50.2054 36.2997 54.9522 35.1951 54.9522 33.8284V30.5847" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M44.3958 31.3154C46.6428 31.3154 48.4644 30.9477 48.4644 30.494C48.4644 30.0404 46.6428 29.6726 44.3958 29.6726C42.1487 29.6726 40.3271 30.0404 40.3271 30.494C40.3271 30.9477 42.1487 31.3154 44.3958 31.3154Z" stroke="#D08000" stroke-miterlimit="10"/>
+<path d="M10.7039 31.7175L9.19385 32.7626L12.6752 35.545L14.4125 34.3845L10.7039 31.7175Z" fill="#002140"/>
+<path d="M53.9629 35.0801L56.0496 36.9361C56.0496 36.9361 52.3375 38.0966 51.1771 38.0966L49.0903 36.2405L53.9629 35.0801Z" fill="#002140"/>
+</svg>
diff --git a/docs/assets/images/money-wings.svg b/docs/assets/images/money-wings.svg
new file mode 100644
index 000000000000..c2155080f721
--- /dev/null
+++ b/docs/assets/images/money-wings.svg
@@ -0,0 +1,26 @@
+<svg width="69" height="68" viewBox="0 0 69 68" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M52.5717 55.511C52.5717 55.511 46.6865 50.4596 46.1063 41.7416C45.526 33.0187 47.7738 19.927 47.2228 16.3237C46.6719 12.7156 45.2432 9.30248 43.0979 7.92261L19.2695 11.9159C19.2695 11.9159 22.9459 15.8117 22.9362 21.5994C22.9264 27.387 21.2638 44.8231 22.4145 50.1037C23.5652 55.3842 28.6117 59.9578 28.6117 59.9578L52.5717 55.511Z" fill="#00B368"/>
+<path d="M31.164 56.0506C31.8889 55.2502 31.6078 53.8144 30.536 52.8437C29.4643 51.8729 28.0077 51.7347 27.2828 52.535C26.5579 53.3353 26.839 54.7711 27.9108 55.7419C28.9826 56.7127 30.4391 56.8509 31.164 56.0506Z" fill="#5BE3AA"/>
+<path d="M46.0318 53.7771C46.7567 52.9768 46.5095 51.5718 45.4797 50.6389C44.4498 49.7061 43.0273 49.5987 42.3023 50.399C41.5774 51.1993 41.8246 52.6044 42.8545 53.5372C43.8843 54.47 45.3068 54.5774 46.0318 53.7771Z" fill="#5BE3AA"/>
+<path d="M43.6719 15.06C44.3968 14.2597 44.1496 12.8547 43.1198 11.9219C42.0899 10.9891 40.6674 10.8817 39.9425 11.682C39.2176 12.4823 39.4647 13.8873 40.4946 14.8201C41.5244 15.753 42.947 15.8604 43.6719 15.06Z" fill="#5BE3AA"/>
+<path d="M28.6846 17.6023C29.4095 16.802 29.1623 15.397 28.1325 14.4641C27.1026 13.5313 25.6801 13.4239 24.9552 14.2242C24.2303 15.0245 24.4774 16.4295 25.5073 17.3624C26.5371 18.2952 27.9597 18.4026 28.6846 17.6023Z" fill="#5BE3AA"/>
+<path d="M41.6298 34.7155C41.6298 34.7155 40.9179 23.3304 35.8812 22.443C30.8444 21.5555 27.953 31.0927 28.3041 35.1787C28.6551 39.2647 29.8156 46.7247 35.0084 46.8125C40.2012 46.9003 42.2149 36.5683 41.6298 34.7204V34.7155Z" fill="#5BE3AA"/>
+<path d="M22.5795 29.2692C22.5795 29.2692 19.7466 29.9762 17.4013 28.9961C15.0609 28.0161 11.5161 25.1832 9.12208 25.2368C6.72316 25.2905 5.19702 27.1433 4.38275 29.5422C3.5636 31.9411 3.9488 38.6406 5.41643 39.4061C6.88894 40.1667 7.21562 40.0595 7.21562 40.0595C7.21562 40.0595 6.45499 43.2726 8.30294 44.1454C10.1509 45.0182 11.7355 42.2926 11.7355 42.2926C11.7355 42.2926 12.1695 45.8861 14.0223 45.7252C15.8751 45.5594 16.8016 43.4921 16.8016 43.4921C16.8016 43.4921 17.1819 46.4907 18.708 46.5443C20.2342 46.598 21.7603 44.6379 21.7603 44.6379L22.36 32.8676L22.5795 29.274V29.2692Z" fill="#FFF2B2"/>
+<path d="M46.8815 27.689C46.8815 27.689 45.5845 36.5241 45.8478 39.1327C46.1111 41.7413 48.3003 45.5639 50.1532 45.2373C52.006 44.9106 52.279 41.6438 52.279 41.6438C52.279 41.6438 53.9124 45.0764 55.658 44.2572C57.4036 43.4381 57.4572 40.8782 57.4572 40.8782C57.4572 40.8782 59.5831 44.1451 61.0507 42.892C62.5232 41.6389 62.3038 38.7524 62.3038 38.7524C62.3038 38.7524 63.4496 38.533 63.8836 38.2599C64.3175 37.9869 65.6828 35.4807 65.6291 33.0817C65.5755 30.6828 65.4097 23.7103 60.3973 23.9834C55.385 24.2564 51.8987 30.0295 46.8863 27.689H46.8815Z" fill="#FFF2B2"/>
+<path d="M22.5801 29.269C22.5801 29.269 20.5664 30.0296 18.3138 29.1617C16.0611 28.2889 10.5416 25.0221 9.12276 25.2367C7.70388 25.4561 4.94414 25.6706 4.51019 28.9423C4.07624 32.2091 3.05718 38.7477 5.4171 39.401C7.77702 40.0544 9.15689 38.8939 9.44944 37.2947C9.74199 35.6954 10.9756 32.2823 10.9756 32.2823C10.9756 32.2823 14.6081 36.495 17.2216 36.3487C19.835 36.2025 22.2339 34.8226 22.2339 34.8226L22.5801 29.2641V29.269Z" fill="#FFFAF0"/>
+<path d="M46.6423 28.0013L46.1353 33.16C46.1353 33.16 48.895 35.0469 52.3812 34.2473C55.8675 33.4476 58.3395 30.6879 58.3395 30.6879C58.3395 30.6879 60.0851 38.8989 62.9911 38.6063C64.6635 38.3137 65.9703 33.3014 65.6046 30.6148C65.2438 27.9282 63.9712 23.8227 60.3923 23.9836C56.8134 24.1494 53.6197 28.6498 46.6423 27.9964V28.0013Z" fill="#FFFAF0"/>
+<path d="M28.6308 59.8846C12.8964 45.6325 30.3228 22.0284 19.0352 11.8037L43.2536 7.54224C54.5363 17.762 37.1148 41.3661 52.8492 55.6231L28.6357 59.8846H28.6308Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M28.6713 17.6781C29.4739 16.7919 29.2445 15.2763 28.1587 14.2928C27.073 13.3094 25.5422 13.2305 24.7395 14.1167C23.9368 15.0028 24.1663 16.5184 25.252 17.5019C26.3378 18.4853 27.8686 18.5642 28.6713 17.6781Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M31.2582 56.0167C32.0609 55.1305 31.8314 53.6149 30.7457 52.6315C29.6599 51.648 28.1291 51.5691 27.3264 52.4553C26.5237 53.3414 26.7532 54.8571 27.8389 55.8405C28.9247 56.8239 30.4555 56.9028 31.2582 56.0167Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M46.1332 53.8692C46.9359 52.9831 46.7064 51.4675 45.6207 50.484C44.5349 49.5006 43.0041 49.4217 42.2014 50.3078C41.3987 51.194 41.6282 52.7096 42.7139 53.693C43.7997 54.6765 45.3305 54.7554 46.1332 53.8692Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M43.7733 15.1517C44.576 14.2655 44.3465 12.7499 43.2608 11.7665C42.1751 10.783 40.6442 10.7042 39.8415 11.5903C39.0389 12.4765 39.2683 13.9921 40.3541 14.9755C41.4398 15.959 42.9707 16.0378 43.7733 15.1517Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M41.7767 34.6321C41.8108 27.8946 38.815 22.4175 35.0855 22.3986C31.3559 22.3797 28.3048 27.8262 28.2707 34.5637C28.2366 41.3012 31.2324 46.7782 34.962 46.7971C38.6915 46.816 41.7426 41.3695 41.7767 34.6321Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M22.7308 29.2935C14.3541 30.254 12.8279 24.4761 7.70339 25.4561C4.99728 25.973 4.15864 29.5665 3.89534 31.8582C3.67593 33.7451 3.359 39.406 5.9432 40.0008C9.10763 40.7273 10.5119 33.7695 10.8922 31.668C10.8922 31.668 16.1386 39.8448 22.1067 34.8276" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.3521 39.8547C7.3521 39.8547 6.28916 44.1991 8.9075 44.5257C11.521 44.8524 14.466 35.7004 14.466 35.7004" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.2627 41.1172C12.2627 41.1172 11.5606 45.6615 14.1935 45.7639C16.8265 45.8663 18.9719 36.4949 18.9719 36.4949" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.2744 42.0632C17.2744 42.0632 16.5723 46.6075 19.2052 46.7099C20.0634 46.7441 20.8679 45.7738 21.5652 44.4475" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M46.6126 27.8403C54.9893 28.8009 56.5154 23.023 61.64 24.003C64.3461 24.5199 65.1847 28.1134 65.448 30.405C65.6674 32.292 65.9844 37.9529 63.4001 38.5477C60.2357 39.2742 58.8315 32.3164 58.4511 30.2149C58.4511 30.2149 54.726 36.8412 46.4468 33.4086" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M61.9962 38.3969C61.9962 38.3969 63.0591 42.7462 60.4457 43.0729C57.8322 43.3995 54.8872 34.2476 54.8872 34.2476" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M57.0861 39.6643C57.0861 39.6643 57.7883 44.2086 55.1553 44.311C52.5223 44.4134 50.377 35.042 50.377 35.042" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M52.0739 40.6104C52.0739 40.6104 52.776 45.1547 50.143 45.257C49.2849 45.2912 47.4272 44.3111 46.0132 40.8249" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/docs/assets/images/monitor.svg b/docs/assets/images/monitor.svg
new file mode 100644
index 000000000000..6e2580b4c9e8
--- /dev/null
+++ b/docs/assets/images/monitor.svg
@@ -0,0 +1,12 @@
+<svg width="69" height="68" viewBox="0 0 69 68" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M35.0844 59.8695H20.6099C19.2016 59.8695 19.1047 57.1759 20.7022 57.1759C26.8567 57.1759 32.8266 55.0211 32.8266 51.2502L32.8451 51.2357V47.0367H32.8035H12.1191C9.21031 47.0367 6.83252 44.5596 6.83252 41.5294V14.5075C6.83252 11.4773 9.21031 9.00024 12.1191 9.00024H57.3802C60.2889 9.00024 62.6667 11.4773 62.6667 14.5075V41.5342C62.6667 44.5644 60.2889 47.0415 57.3802 47.0415H36.7049V47.0704L36.6542 51.2405V51.255C36.6588 55.0259 42.6287 57.1807 48.7878 57.1807C50.3853 57.1807 50.293 59.8743 48.8802 59.8743C48.1599 59.8743 41.1281 59.8743 34.4057 59.8743H35.089L35.0844 59.8695Z" fill="#29736D" stroke="#002140" stroke-miterlimit="10"/>
+<path d="M57.9383 11.7419H11.5552C10.2956 11.7419 9.27441 12.8057 9.27441 14.118V42.0874C9.27441 43.3997 10.2956 44.4635 11.5552 44.4635H57.9383C59.198 44.4635 60.2192 43.3997 60.2192 42.0874V14.118C60.2192 12.8057 59.198 11.7419 57.9383 11.7419Z" fill="#59A9FF" stroke="#002140" stroke-miterlimit="10"/>
+<rect x="15.1665" y="14.5002" width="35" height="11.8571" rx="2.5" fill="#FFFAF0" stroke="#002140"/>
+<rect x="28.3813" y="17.4287" width="12" height="1.63124" fill="#002140"/>
+<rect x="28.3813" y="21.7144" width="18" height="1.63124" fill="#002140"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.1094 16.8258C25.5442 17.1469 25.6364 17.7597 25.3153 18.1945L21.0562 23.962L17.9955 21.1669C17.5964 20.8024 17.5683 20.1833 17.9328 19.7842C18.2973 19.385 18.9164 19.3569 19.3155 19.7214L20.7721 21.0516L23.7406 17.0317C24.0617 16.5968 24.6746 16.5046 25.1094 16.8258Z" fill="#03D47C"/>
+<rect x="20.1665" y="29.5002" width="35" height="11.8571" rx="2.5" fill="#FFFAF0" stroke="#002140"/>
+<rect x="33.3813" y="32.4287" width="12" height="1.63124" fill="#002140"/>
+<rect x="33.3813" y="36.7144" width="18" height="1.63124" fill="#002140"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30.1099 31.8258C30.5447 32.1469 30.6369 32.7597 30.3158 33.1945L26.0567 38.962L22.996 36.1669C22.5968 35.8024 22.5688 35.1833 22.9333 34.7842C23.2978 34.385 23.9169 34.3569 24.316 34.7214L25.7726 36.0516L28.7411 32.0317C29.0622 31.5968 29.675 31.5046 30.1099 31.8258Z" fill="#03D47C"/>
+</svg>
diff --git a/docs/assets/images/settings-new-dot.svg b/docs/assets/images/settings-new-dot.svg
new file mode 100644
index 000000000000..13338fc72362
--- /dev/null
+++ b/docs/assets/images/settings-new-dot.svg
@@ -0,0 +1,88 @@
+<svg width="387" height="264" viewBox="0 0 387 264" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1626_5856)">
+<rect x="0.5" width="386.5" height="264" fill="#1A3D32"/>
+<g clip-path="url(#clip1_1626_5856)">
+<rect x="84" y="20" width="220" height="476.373" rx="14.08" fill="#061B09"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M104.676 48.403C104.217 48.8613 103.475 48.8613 103.016 48.403L98.08 43.4667L103.016 38.5304C103.475 38.0722 104.217 38.0722 104.676 38.5304C105.134 38.9886 105.134 39.7315 104.676 40.1897L101.399 43.4667L104.676 46.7437C105.134 47.2019 105.134 47.9448 104.676 48.403Z" fill="#8B9C8F"/>
+<path d="M115.411 46.5864C113.586 46.5864 112.479 45.7386 112.449 44.1628H113.845C113.875 44.9707 114.374 45.3796 115.411 45.3796C116.259 45.3796 116.818 45.1003 116.818 44.5119C116.818 44.083 116.608 43.8636 115.701 43.6542L114.773 43.4547C113.227 43.1057 112.629 42.5372 112.629 41.4301C112.629 40.2932 113.486 39.3657 115.242 39.3657C117.037 39.3657 117.964 40.2433 118.034 41.6496H116.638C116.598 40.9514 116.149 40.5724 115.242 40.5724C114.494 40.5724 114.035 40.8218 114.035 41.3204C114.035 41.7393 114.234 41.9488 115.132 42.1482L116.05 42.3577C117.615 42.7167 118.224 43.2852 118.224 44.3922C118.224 45.8583 117.047 46.5864 115.411 46.5864ZM123.676 44.0332V44.2825H120.225C120.305 45.1302 120.744 45.4993 121.342 45.4993C121.93 45.4993 122.19 45.24 122.309 44.8909H123.676C123.307 46.2074 122.269 46.5864 121.342 46.5864C119.836 46.5864 118.849 45.579 118.849 44.0033C118.849 42.1582 120.075 41.4401 121.292 41.4401C122.828 41.4401 123.676 42.5472 123.676 44.0332ZM120.255 43.4547H122.259C122.2 42.7765 121.851 42.4674 121.292 42.4674C120.793 42.4674 120.384 42.7366 120.255 43.4547ZM126.258 46.5664C125.181 46.5664 124.752 45.988 124.752 45.1901V42.6668H124.064V41.5498H124.343C124.643 41.5498 124.792 41.4002 124.792 41.101V40.2134H126.099V41.5498H127.116V42.6668H126.099V44.8709C126.099 45.24 126.208 45.4195 126.607 45.4195C126.817 45.4195 126.946 45.3796 127.116 45.3297V46.4368C126.857 46.5165 126.518 46.5664 126.258 46.5664ZM129.706 46.5664C128.629 46.5664 128.2 45.988 128.2 45.1901V42.6668H127.512V41.5498H127.791C128.09 41.5498 128.24 41.4002 128.24 41.101V40.2134H129.546V41.5498H130.564V42.6668H129.546V44.8709C129.546 45.24 129.656 45.4195 130.055 45.4195C130.265 45.4195 130.394 45.3796 130.564 45.3297V46.4368C130.304 46.5165 129.965 46.5664 129.706 46.5664ZM132.098 40.8018C131.679 40.8018 131.37 40.4827 131.37 40.0837C131.37 39.6848 131.679 39.3756 132.098 39.3756C132.517 39.3756 132.826 39.6848 132.826 40.0837C132.826 40.4827 132.517 40.8018 132.098 40.8018ZM132.766 46.4667H131.42V41.5498H132.766V46.4667ZM135.328 46.4667H133.981V41.5498H135.248V42.1482C135.587 41.6695 136.056 41.4401 136.654 41.4401C137.861 41.4401 138.459 42.0585 138.459 43.5445V46.4667H137.123V43.6542C137.123 42.8563 136.844 42.587 136.285 42.587C135.667 42.587 135.328 43.0059 135.328 43.7938V46.4667ZM140.857 45.5292H142.533C143.759 45.5292 144.348 46.0378 144.348 46.9155C144.348 47.9926 143.42 48.7007 141.635 48.7007C140.089 48.7007 139.251 48.1821 139.251 47.3643C139.251 46.9354 139.501 46.6063 139.94 46.4268C139.501 46.2074 139.361 45.8384 139.361 45.4594C139.361 45.0505 139.62 44.6814 140.079 44.4421C139.73 44.1329 139.531 43.7041 139.531 43.2054C139.531 42.1682 140.378 41.4401 141.655 41.4401C142.064 41.4401 142.423 41.5099 142.732 41.6496C143.001 41.121 143.261 40.7719 144.288 40.722V41.7293C143.829 41.7293 143.55 41.849 143.4 42.1482C143.64 42.4275 143.779 42.7965 143.779 43.2054C143.789 44.2426 142.932 44.9707 141.655 44.9707C141.296 44.9707 140.977 44.9108 140.688 44.8011C140.518 44.9009 140.428 45.0704 140.428 45.2001C140.428 45.3896 140.528 45.5292 140.857 45.5292ZM141.655 42.4075C141.116 42.4075 140.787 42.7366 140.787 43.2054C140.787 43.6741 141.126 43.9933 141.655 43.9933C142.184 43.9933 142.523 43.6741 142.523 43.2054C142.523 42.7366 142.184 42.4075 141.655 42.4075ZM141.685 47.7133C142.602 47.7133 143.001 47.4939 143.001 47.0352C143.001 46.7459 142.782 46.6063 142.333 46.6063H140.937C140.867 46.6063 140.807 46.6063 140.737 46.5963C140.558 46.726 140.448 46.8856 140.448 47.1149C140.448 47.474 140.717 47.7133 141.685 47.7133ZM146.921 46.5864C145.565 46.5864 144.777 46.0079 144.667 44.8909H145.994C146.073 45.3896 146.382 45.599 146.961 45.599C147.49 45.599 147.789 45.4494 147.789 45.1103C147.789 44.851 147.599 44.6914 147.081 44.5817L146.672 44.482C145.385 44.1928 144.827 43.7938 144.827 42.976C144.827 41.9587 145.585 41.4401 146.841 41.4401C148.228 41.4401 148.986 41.9986 149.045 43.0857H147.729C147.699 42.607 147.41 42.4175 146.891 42.4175C146.422 42.4175 146.153 42.5571 146.153 42.8862C146.153 43.1356 146.333 43.2952 146.841 43.4049L147.26 43.4946C148.537 43.7838 149.115 44.1928 149.115 45.0205C149.115 46.0478 148.287 46.5864 146.921 46.5864Z" fill="#E7ECE9"/>
+<g clip-path="url(#clip2_1626_5856)">
+<path d="M217.467 62.24H170.533V109.173H217.467V62.24Z" fill="#03D47C"/>
+<path d="M180.624 82.7147C180.624 82.7147 179.685 85.0027 178.101 85.1787C178.101 85.1787 180.272 86.1174 180.448 87.5254C180.448 87.5254 181.328 85.4721 183.029 85.2374C183.029 85.2374 180.741 84.7094 180.624 82.7147Z" fill="#008C59"/>
+<path d="M208.197 87.9359C208.197 87.9359 207.259 90.2239 205.675 90.3999C205.675 90.3999 207.845 91.3386 208.021 92.7466C208.021 92.7466 208.901 90.6932 210.603 90.4586C210.661 90.4586 208.315 89.9306 208.197 87.9359Z" fill="#008C59"/>
+<path d="M193.941 104.715C183.381 104.715 174.757 96.0907 174.757 85.5307C174.757 74.9707 183.381 66.3467 193.941 66.3467C204.501 66.3467 213.125 74.9707 213.125 85.5307C213.125 96.1493 204.501 104.715 193.941 104.715ZM193.941 66.9333C183.675 66.9333 175.344 75.3227 175.344 85.5307C175.344 95.7387 183.675 104.128 193.941 104.128C204.208 104.128 212.539 95.7973 212.539 85.5307C212.539 75.264 204.208 66.9333 193.941 66.9333Z" fill="#002140"/>
+<path d="M208.139 93.3332C208.021 93.3332 207.904 93.2159 207.845 93.0986C207.376 91.3972 207.083 91.1039 205.381 90.6346C205.264 90.5759 205.147 90.4586 205.147 90.3412C205.147 90.2239 205.264 90.1066 205.381 90.0479C207.083 89.5786 207.376 89.2852 207.845 87.5839C207.904 87.4666 208.021 87.3492 208.139 87.3492C208.256 87.3492 208.373 87.4666 208.432 87.5839C208.901 89.2852 209.195 89.5786 210.896 90.0479C211.013 90.1066 211.131 90.2239 211.131 90.3412C211.131 90.4586 211.013 90.5759 210.896 90.6346C209.195 91.1039 208.901 91.3972 208.432 93.0986C208.373 93.2746 208.256 93.3332 208.139 93.3332ZM206.437 90.3999C207.317 90.7519 207.787 91.1626 208.139 92.1012C208.491 91.2212 208.901 90.7519 209.84 90.3999C208.96 90.0479 208.491 89.6372 208.139 88.6986C207.787 89.6372 207.376 90.0479 206.437 90.3999Z" fill="#002140"/>
+<path d="M180.389 88.288C180.272 88.288 180.155 88.1707 180.096 88.0533C179.627 86.352 179.333 86.0587 177.632 85.5893C177.515 85.5307 177.397 85.4133 177.397 85.296C177.397 85.1787 177.515 85.0613 177.632 85.0027C179.333 84.5333 179.627 84.24 180.096 82.5387C180.155 82.304 180.624 82.304 180.683 82.5387C181.152 84.24 181.445 84.5333 183.147 85.0027C183.264 85.0613 183.381 85.1787 183.381 85.296C183.381 85.4133 183.264 85.5307 183.147 85.5893C181.445 86.0587 181.152 86.352 180.683 88.0533C180.624 88.2293 180.507 88.288 180.389 88.288ZM178.747 85.3547C179.627 85.7067 180.096 86.1173 180.448 87.056C180.8 86.176 181.211 85.7067 182.149 85.3547C181.269 85.0027 180.8 84.592 180.448 83.6533C180.037 84.5333 179.627 85.0027 178.747 85.3547Z" fill="#002140"/>
+<path d="M190.363 74.5013L203.445 78.96C203.445 78.96 203.856 76.3786 200.336 74.7946L200.805 71.6266C200.805 71.6266 200.512 69.5733 198.987 69.1626C197.52 68.752 195.995 69.808 195.76 70.2773C195.525 70.7466 194.587 73.0346 194.587 73.0346C194.587 73.0346 191.184 73.0346 190.363 74.5013Z" fill="#008C59"/>
+<path d="M203.445 79.2533H203.387C203.211 79.1946 203.152 79.0186 203.211 78.9013C203.68 77.3173 201.216 75.0879 197.755 74.0319C194.528 73.0346 191.36 73.3279 190.597 74.6773C190.539 74.7946 190.363 74.8533 190.187 74.7946C190.069 74.7359 190.011 74.5599 190.069 74.3839C190.949 72.7413 194.352 72.3306 197.872 73.4453C201.744 74.6773 204.267 77.1413 203.68 79.0186C203.68 79.1359 203.563 79.2533 203.445 79.2533Z" fill="#002140"/>
+<path d="M200.336 75.088C200.336 75.088 200.277 75.088 200.336 75.088C200.16 75.088 200.043 74.912 200.043 74.736L200.453 71.9786C200.571 70.7466 199.808 69.632 198.635 69.3386C197.52 69.0453 196.288 69.6906 195.877 70.8053L195.056 72.976C194.997 73.152 194.821 73.2106 194.704 73.152C194.528 73.0933 194.469 72.9173 194.528 72.8L195.349 70.6293C195.877 69.2213 197.344 68.4 198.811 68.752C200.277 69.104 201.216 70.512 201.04 72.0373L200.629 74.7946C200.571 74.9706 200.453 75.088 200.336 75.088Z" fill="#002140"/>
+<path d="M188.133 97.3226C188.133 97.3226 188.427 98.0852 189.131 98.0852C189.835 98.0852 190.832 98.1439 190.832 98.1439L191.477 98.6719C191.477 98.6719 192.005 100.432 193.355 100.256C194.763 100.08 194.469 98.7892 194.645 99.0239C195.877 99.1412 195.877 98.7306 196.053 97.7919C196.053 97.7919 197.168 97.6159 197.285 96.7359C197.285 96.7359 199.163 97.3812 201.685 96.1492C204.149 94.9172 203.739 93.0399 203.68 92.2772C203.621 91.5146 202.683 89.6372 202.331 89.4026C201.979 89.1679 201.099 88.4052 201.099 88.4052L188.544 84.7092L192.416 93.5092C192.416 93.3919 186.784 93.8026 188.133 97.3226Z" fill="#03D47C"/>
+<path d="M181.445 79.3707C181.445 79.3707 181.328 82.2453 186.08 83.7707C190.891 85.296 200.453 88.0533 200.453 88.0533C200.453 88.0533 207.435 89.5787 208.491 85.8827C209.488 82.1867 207.669 81.1893 206.32 80.368C206.32 80.368 200.16 76.9653 193.765 75.4987C187.312 73.9733 184.027 73.7973 182.267 76.672C181.915 77.728 181.445 78.96 181.445 79.3707Z" fill="#008C59"/>
+<path d="M190.949 83.0667C192.475 83.0667 193.707 81.8347 193.707 80.3093C193.707 78.784 192.475 77.552 190.949 77.552C189.424 77.552 188.192 78.784 188.192 80.3093C188.192 81.8347 189.424 83.0667 190.949 83.0667Z" fill="#8EECC4"/>
+<path d="M196.523 84.944C198.048 84.944 199.28 83.712 199.28 82.1867C199.28 80.6613 198.048 79.4293 196.523 79.4293C194.997 79.4293 193.765 80.6613 193.765 82.1867C193.765 83.712 194.997 84.944 196.523 84.944Z" fill="#8EECC4"/>
+<path d="M189.365 86.9388L188.309 84.6508L180.096 93.8614C180.096 93.8614 179.861 95.4454 180.213 96.0908C180.507 96.7361 181.973 97.3228 181.973 97.3228L188.133 97.2641C188.133 97.2641 187.547 95.3281 188.603 94.6241L183.264 94.5654L182.853 94.3894L189.365 86.9388Z" fill="#002140"/>
+<path d="M187.253 74.3253C187.253 74.3253 184.672 74.6187 183.792 75.2053C183.792 75.2053 183.851 78.3733 186.373 77.6107C188.955 76.848 187.605 74.384 187.253 74.3253Z" fill="#002140"/>
+<path d="M184.555 78.9014C184.555 78.9014 182.501 78.9014 182.091 80.896C182.091 80.896 183.323 82.5387 184.144 82.8907C184.144 82.8907 185.845 82.832 186.08 81.3654C186.315 79.8987 185.259 78.9014 184.555 78.9014Z" fill="#002140"/>
+<path d="M196.933 76.496C196.933 76.496 193.707 75.3226 193.179 75.3226C192.651 75.3813 192.709 77.728 194.528 78.1386C196.347 78.608 196.933 76.496 196.933 76.496Z" fill="#002140"/>
+<path d="M205.029 79.84L202.096 78.432C202.096 78.432 201.157 79.2533 201.099 79.7813C201.04 80.3093 201.275 82.128 202.624 82.2453C203.973 82.4213 205.088 81.3067 205.029 79.84Z" fill="#002140"/>
+<path d="M207.845 81.8933C207.845 81.8933 206.672 82.1866 206.789 83.536C206.907 84.8853 208.667 85.12 208.667 85.12C208.667 85.12 209.547 82.5973 207.845 81.8933Z" fill="#002140"/>
+<path d="M202.389 88.3466L204.443 88.5226C204.443 88.5226 205.792 87.4666 205.499 86.4692C205.205 85.4719 204.443 84.6506 203.152 84.7679C201.861 84.8852 201.627 86.1172 201.568 86.4106C201.333 87.2906 202.155 88.2879 202.389 88.3466Z" fill="#002140"/>
+<path d="M203.739 88.8748C202.096 88.8748 200.395 88.4054 199.221 88.0534C195.525 86.9974 191.771 85.8241 188.133 84.7094L187.019 84.3574C184.027 83.4188 182.267 82.2454 181.504 80.7201C181.035 79.7228 181.035 78.6081 181.563 77.4348C183.851 71.9788 191.477 74.3841 196.053 75.8508C196.581 76.0268 197.109 76.2028 197.579 76.3201C199.749 76.9654 202.037 77.9041 204.443 79.1361L204.677 79.2534C206.496 80.1921 209.195 81.5414 209.195 84.0641C209.195 84.7094 209.019 85.4134 208.608 86.1174C207.493 88.2881 205.616 88.8748 203.739 88.8748ZM187.488 74.6774C185.141 74.6774 183.088 75.4401 182.149 77.7281C181.739 78.7841 181.68 79.7228 182.091 80.5441C182.736 81.8934 184.437 83.0081 187.253 83.8881L188.368 84.2401C192.005 85.3548 195.701 86.5281 199.397 87.5841C202.976 88.5814 206.496 89.0508 208.139 85.9414C208.491 85.2961 208.667 84.7094 208.667 84.1228C208.667 82.0108 206.261 80.7788 204.443 79.8401L204.208 79.7228C201.861 78.4908 199.573 77.6108 197.461 76.9654C196.992 76.8481 196.464 76.6721 195.877 76.4961C193.472 75.6748 190.245 74.6774 187.488 74.6774Z" fill="#002140"/>
+<path d="M190.832 83.536C189.072 83.536 187.664 82.128 187.664 80.4267C187.664 78.7254 189.072 77.3174 190.832 77.3174C192.592 77.3174 194 78.7254 194 80.4267C194 82.128 192.592 83.536 190.832 83.536ZM190.832 77.904C189.424 77.904 188.251 79.0187 188.251 80.4267C188.251 81.8347 189.424 82.9494 190.832 82.9494C192.24 82.9494 193.413 81.8347 193.413 80.4267C193.413 79.0187 192.24 77.904 190.832 77.904Z" fill="#002140"/>
+<path d="M191.184 80.5439L192.944 80.6612C193.003 79.6639 192.416 78.7252 191.477 78.6079C190.539 78.4319 189.6 79.2532 189.424 80.3679C189.248 81.4826 189.893 82.5386 190.832 82.7146C191.419 82.8319 191.947 82.5972 192.357 82.1279L191.184 80.5439Z" fill="#002140"/>
+<path d="M196.523 82.128L198.283 82.2453C198.341 81.248 197.755 80.3093 196.816 80.192C195.877 80.016 194.939 80.8373 194.763 81.952C194.587 83.0667 195.232 84.1227 196.171 84.2987C196.757 84.416 197.285 84.1813 197.696 83.712L196.523 82.128Z" fill="#002140"/>
+<path d="M196.464 85.3547C194.704 85.3547 193.296 83.9467 193.296 82.2453C193.296 80.544 194.704 79.136 196.464 79.136C198.224 79.136 199.632 80.544 199.632 82.2453C199.632 83.9467 198.224 85.3547 196.464 85.3547ZM196.464 79.664C195.056 79.664 193.883 80.7787 193.883 82.1867C193.883 83.5947 195.056 84.7093 196.464 84.7093C197.872 84.7093 199.045 83.5947 199.045 82.1867C199.045 80.7787 197.872 79.664 196.464 79.664Z" fill="#002140"/>
+<path d="M192.357 93.6267C192.24 93.6267 192.123 93.5681 192.064 93.4507L188.075 84.6507C188.016 84.4747 188.075 84.3574 188.192 84.2401C188.368 84.1814 188.485 84.2401 188.603 84.3574L192.592 93.1574C192.651 93.3334 192.592 93.4507 192.475 93.5681C192.416 93.6267 192.416 93.6267 192.357 93.6267Z" fill="#002140"/>
+<path d="M198.752 97.2054C197.755 97.2054 197.285 96.9707 197.285 96.9707C197.109 96.912 197.051 96.736 197.168 96.56C197.227 96.4427 197.403 96.3254 197.579 96.4427C197.579 96.4427 198.048 96.6187 199.045 96.6187C199.984 96.56 203.563 95.856 203.563 92.9227C203.563 90.048 200.981 88.5227 200.981 88.5227C200.864 88.464 200.805 88.288 200.864 88.112C200.923 87.9947 201.099 87.936 201.275 87.9947C201.392 88.0534 204.149 89.6374 204.149 92.864C204.149 96.2667 200.101 97.088 199.045 97.1467C198.928 97.2054 198.869 97.2054 198.752 97.2054Z" fill="#002140"/>
+<path d="M194.88 99.3174C194.821 99.3174 194.763 99.3174 194.763 99.3174C194.587 99.3174 194.469 99.1414 194.469 99.024C194.469 98.848 194.645 98.7307 194.763 98.7307C194.763 98.7307 195.408 98.7894 195.701 98.3787C195.819 98.2614 195.877 97.968 195.76 97.616C195.701 97.264 195.349 96.4427 194 95.7974C193.883 95.7387 193.824 95.5627 193.883 95.3867C193.941 95.2694 194.117 95.2107 194.293 95.2694C195.819 96.032 196.229 96.9707 196.347 97.4987C196.464 97.968 196.405 98.4374 196.171 98.7307C195.819 99.2587 195.173 99.3174 194.88 99.3174Z" fill="#002140"/>
+<path d="M193.413 100.667C192.475 100.667 191.947 99.728 191.595 99.0827C191.536 98.9653 191.477 98.848 191.419 98.7307C191.184 98.3787 191.008 98.3787 189.717 98.4373H189.483C188.133 98.496 187.664 97.088 187.664 96.3253C187.664 95.68 187.899 95.0933 188.368 94.624C189.248 93.744 190.773 93.2747 192.592 93.2747C193.824 93.2747 195.525 94.096 195.643 94.1547C197.168 94.9173 197.579 95.856 197.696 96.384C197.813 96.8533 197.755 97.3227 197.52 97.616C197.227 98.0267 196.699 98.2027 196.405 98.2027C196.229 98.2027 196.112 98.0853 196.112 97.968C196.112 97.792 196.229 97.6747 196.347 97.6747C196.581 97.6747 196.875 97.5573 197.051 97.3227C197.168 97.2053 197.227 96.912 197.109 96.56C197.051 96.208 196.699 95.3867 195.349 94.7413C195.349 94.7413 193.648 93.92 192.592 93.92C190.891 93.92 189.541 94.3307 188.779 95.0933C188.427 95.504 188.192 95.9147 188.251 96.384C188.251 96.4427 188.309 97.968 189.483 97.9093H189.717C191.008 97.8507 191.536 97.8507 191.947 98.496C192.005 98.6133 192.064 98.7307 192.181 98.9067C192.475 99.4347 192.885 100.197 193.472 100.197C194.176 100.197 194.469 99.904 194.469 99.2587C194.469 98.7307 193.472 97.5573 192.357 96.9707C192.24 96.912 192.181 96.736 192.24 96.56C192.299 96.4427 192.475 96.384 192.651 96.4427C193.765 97.0293 195.056 98.3787 195.056 99.2587C194.997 100.139 194.469 100.667 193.413 100.667Z" fill="#002140"/>
+<path d="M188.485 94.976H183.323C183.088 94.976 182.912 94.8587 182.853 94.6827C182.736 94.5067 182.795 94.272 182.912 94.096L189.131 86.88C189.248 86.7627 189.424 86.7627 189.541 86.8214C189.659 86.9387 189.659 87.1147 189.6 87.232L183.44 94.3894H188.485C188.661 94.3894 188.779 94.5067 188.779 94.6827C188.779 94.8587 188.661 94.976 188.485 94.976Z" fill="#002140"/>
+<path d="M188.075 97.7334H182.267C181.211 97.7334 180.331 97.1467 179.861 96.2081C179.451 95.2694 179.627 94.1547 180.272 93.3921L188.192 84.4747C188.309 84.3574 188.485 84.3574 188.603 84.4747C188.72 84.5921 188.72 84.7681 188.603 84.8854L180.741 93.7441C180.213 94.3307 180.096 95.2107 180.389 95.9147C180.741 96.6774 181.445 97.0881 182.267 97.0881H188.133C188.309 97.0881 188.427 97.2054 188.427 97.3814C188.427 97.5574 188.251 97.7334 188.075 97.7334Z" fill="#002140"/>
+<path d="M204.501 88.7574C204.384 88.7574 204.325 88.6988 204.267 88.6401C204.208 88.5228 204.208 88.3468 204.384 88.2294C204.912 87.9361 205.205 87.4081 205.205 86.8214C205.205 85.8828 204.443 85.1788 203.563 85.1788C202.624 85.1788 201.92 85.9414 201.92 86.8214C201.92 87.3494 202.155 87.8188 202.565 88.1708C202.683 88.2881 202.741 88.4641 202.624 88.5814C202.507 88.6988 202.331 88.7574 202.213 88.6401C201.627 88.2294 201.333 87.5841 201.333 86.8801C201.333 85.6481 202.331 84.6508 203.563 84.6508C204.795 84.6508 205.792 85.6481 205.792 86.8801C205.792 87.7014 205.381 88.4054 204.736 88.8161C204.619 88.7574 204.56 88.7574 204.501 88.7574Z" fill="#002140"/>
+<path d="M208.432 85.4134C207.317 85.4134 206.437 84.5334 206.437 83.4187C206.437 82.5387 206.965 81.776 207.845 81.5414C208.021 81.4827 208.139 81.6 208.197 81.7174C208.256 81.8934 208.139 82.0107 208.021 82.0694C207.435 82.2454 207.024 82.7734 207.024 83.4187C207.024 84.1814 207.669 84.8267 208.432 84.8267C208.491 84.8267 208.549 84.8267 208.608 84.8267C208.784 84.8267 208.901 84.8854 208.96 85.0614C209.019 85.2374 208.901 85.3547 208.725 85.4134C208.608 85.4134 208.549 85.4134 208.432 85.4134Z" fill="#002140"/>
+<path d="M202.976 82.5973C201.685 82.5973 200.688 81.5413 200.688 80.3093C200.688 79.4293 201.216 78.6079 201.979 78.2559C202.096 78.1973 202.272 78.2559 202.389 78.3733C202.448 78.4906 202.389 78.6666 202.272 78.7839C201.685 79.0773 201.333 79.6639 201.333 80.3093C201.333 81.2479 202.096 82.0106 203.035 82.0106C203.973 82.0106 204.736 81.2479 204.736 80.3093C204.736 80.1919 204.736 80.0746 204.677 79.9573C204.619 79.7813 204.736 79.6639 204.912 79.6053C205.088 79.5466 205.205 79.6639 205.264 79.8399C205.323 80.0159 205.323 80.1333 205.323 80.3093C205.264 81.5413 204.267 82.5973 202.976 82.5973Z" fill="#002140"/>
+<path d="M184.32 83.184C184.144 83.184 184.027 83.0667 184.027 82.8907C184.027 82.7147 184.144 82.5974 184.32 82.5974C185.2 82.5387 185.845 81.776 185.845 80.896C185.845 79.9574 185.083 79.1947 184.144 79.1947C183.205 79.1947 182.443 79.9574 182.443 80.896C182.443 80.9547 182.443 81.072 182.443 81.1307C182.443 81.3067 182.325 81.424 182.208 81.4827C182.032 81.4827 181.915 81.3654 181.856 81.248C181.856 81.1307 181.856 81.0134 181.856 80.896C181.856 79.6054 182.912 78.608 184.144 78.608C185.376 78.608 186.432 79.664 186.432 80.896C186.432 82.128 185.552 83.0667 184.32 83.184Z" fill="#002140"/>
+<path d="M185.787 77.9626C184.496 77.9626 183.44 76.9066 183.44 75.616C183.44 75.4986 183.44 75.3226 183.499 75.2053C183.499 75.0293 183.675 74.912 183.851 74.9706C184.027 74.9706 184.144 75.1466 184.085 75.3226C184.085 75.44 184.085 75.4986 184.085 75.616C184.085 76.5546 184.848 77.376 185.845 77.376C186.843 77.376 187.605 76.6133 187.605 75.616C187.605 75.264 187.488 74.8533 187.253 74.56C187.136 74.4426 187.195 74.2666 187.312 74.1493C187.429 74.032 187.605 74.0906 187.723 74.208C188.016 74.6186 188.192 75.088 188.192 75.616C188.133 76.9066 187.077 77.9626 185.787 77.9626Z" fill="#002140"/>
+<path d="M194.997 78.4906C193.707 78.4906 192.651 77.4346 192.651 76.1439C192.651 75.8506 192.709 75.5573 192.827 75.2639C192.885 75.0879 193.061 75.0293 193.237 75.0879C193.413 75.1466 193.472 75.3226 193.413 75.4986C193.355 75.7333 193.296 75.9093 193.296 76.1439C193.296 77.0826 194.059 77.9039 195.056 77.9039C195.877 77.9039 196.581 77.3173 196.757 76.4959C196.816 76.3199 196.933 76.2026 197.109 76.2613C197.285 76.3199 197.344 76.4373 197.344 76.6133C197.051 77.7279 196.112 78.4906 194.997 78.4906Z" fill="#002140"/>
+<path d="M195.525 88.1119L194.117 89.8133C194.117 89.8133 193.824 90.3413 194.117 90.5759C194.411 90.8106 194.821 90.8106 195.056 90.5759C195.291 90.3413 196.288 88.8746 196.288 88.8746L195.525 88.1119Z" fill="#8EECC4"/>
+<path d="M197.051 89.0507L195.643 90.752C195.643 90.752 195.349 91.28 195.643 91.5147C195.936 91.7493 196.347 91.7493 196.581 91.5147C196.816 91.28 197.813 89.8133 197.813 89.8133L197.051 89.0507Z" fill="#8EECC4"/>
+<path d="M196.757 91.456C196.757 91.456 196.64 91.984 195.995 91.7493C195.349 91.456 195.408 90.6933 195.408 90.6933C195.408 90.6933 194.235 91.3387 194.117 90.576C194 89.8133 193.765 89.9307 194.235 89.4027C194.763 88.8747 195.349 87.936 195.349 87.936C195.349 87.936 194.176 87.056 193.589 87.232C193.003 87.408 192.123 88.2293 192.123 88.464C192.123 88.6987 192.005 91.5147 195.584 92.5707C199.163 93.6267 199.632 92.4533 199.867 91.8667C200.101 91.3387 200.571 90.752 199.691 90.3413C198.811 89.9307 198.048 89.696 198.048 89.696L196.757 91.456Z" fill="#002140"/>
+<path d="M193.941 89.9307L195.408 87.9947C195.408 87.9947 193.589 86.528 192.475 87.936C191.36 89.344 193.179 91.28 193.179 91.28C193.179 91.28 195.643 93.0987 197.52 93.1573C199.397 93.216 199.984 91.7493 199.984 91.7493L199.867 90.6933L198.048 89.6373L196.405 91.808C196.405 91.808 195.936 91.7493 195.643 91.6907C195.349 91.5733 195.467 90.576 195.467 90.576C195.467 90.576 194.411 90.9867 194.176 90.752C193.941 90.576 193.941 89.9307 193.941 89.9307Z" fill="#002140"/>
+<path d="M197.813 93.4506C196.64 93.4506 195.349 92.9226 194.704 92.6293C192.24 91.4559 191.888 89.8133 191.829 89.5786C191.829 89.5786 191.829 89.5786 191.829 89.5199C191.712 88.4639 192.064 87.6426 192.827 87.2319C193.941 86.7039 195.173 87.2906 195.936 88.0533C196.288 88.4053 196.816 88.7573 197.461 89.0506C197.696 89.1679 197.872 89.2266 198.107 89.3439C198.635 89.5786 199.221 89.8133 199.691 90.1653C200.043 90.3999 200.219 90.7519 200.277 91.2213C200.277 91.8079 199.984 92.5119 199.515 92.9226C199.045 93.3333 198.459 93.4506 197.813 93.4506ZM192.416 89.4026C192.416 89.4613 192.651 90.9279 194.939 92.0426C195.643 92.3946 197.989 93.3919 199.163 92.3946C199.515 92.1013 199.749 91.5733 199.749 91.1626C199.749 90.9279 199.632 90.6933 199.456 90.5759C198.987 90.2826 198.517 90.0479 197.989 89.8133C197.755 89.6959 197.52 89.6373 197.344 89.5199C196.64 89.1679 196.053 88.8159 195.643 88.4053C194.997 87.7599 194 87.2906 193.179 87.7013C192.357 88.1119 192.357 89.0506 192.416 89.4026Z" fill="#002140"/>
+<path d="M194.528 91.2213C194.235 91.2213 194.059 91.104 194 91.0453C193.883 90.9866 193.648 90.752 193.589 90.4C193.531 90.1066 193.648 89.8133 193.941 89.4613C194.469 88.7573 195.056 87.936 195.056 87.936C195.173 87.8186 195.349 87.76 195.467 87.8773C195.584 87.9946 195.643 88.1706 195.525 88.288C195.525 88.3466 194.939 89.168 194.352 89.872C194.176 90.048 194.117 90.224 194.117 90.4C194.117 90.5173 194.235 90.576 194.293 90.6346C194.293 90.6346 194.411 90.6933 194.528 90.6933C194.704 90.6346 194.939 90.5173 195.115 90.224L196.112 88.8746C196.229 88.7573 196.405 88.6986 196.523 88.816C196.64 88.9333 196.699 89.1093 196.581 89.2266L195.584 90.576C195.291 90.9866 194.939 91.2213 194.587 91.28C194.645 91.1626 194.587 91.2213 194.528 91.2213Z" fill="#002140"/>
+<path d="M196.053 92.16C195.76 92.16 195.584 92.0427 195.525 91.984C195.408 91.9253 195.173 91.6907 195.115 91.3387C195.056 91.0453 195.173 90.752 195.467 90.4C195.76 90.048 196.112 89.52 196.523 88.992C196.64 88.8747 196.816 88.816 196.933 88.9333C197.051 89.0507 197.109 89.2267 196.992 89.344C196.581 89.9307 196.229 90.4 195.936 90.8107C195.76 90.9867 195.701 91.1627 195.701 91.3387C195.701 91.456 195.819 91.5147 195.877 91.5733C195.877 91.5733 195.995 91.632 196.112 91.632C196.288 91.5733 196.523 91.456 196.699 91.1627L197.696 89.8133C197.813 89.696 197.989 89.6373 198.107 89.7547C198.224 89.872 198.283 90.048 198.165 90.1653L197.168 91.5147C196.875 91.9253 196.523 92.16 196.171 92.2187C196.171 92.16 196.112 92.16 196.053 92.16Z" fill="#002140"/>
+</g>
+<path d="M163.401 131.637C162.033 131.637 161.336 131.508 161.336 131.147C161.336 130.863 161.633 130.773 162.394 130.734C162.575 130.682 162.64 130.076 162.64 129.353V125.016C162.64 124.061 162.601 123.313 162.394 123.261H162.123C161.323 123.261 160.613 123.338 160.484 123.571C160.342 123.777 160.265 124.01 160.175 124.319C159.981 125.055 159.826 125.339 159.568 125.339C159.323 125.339 159.168 125.029 159.168 124.552C159.168 123.545 159.658 122.203 160.175 122.203C160.536 122.203 160.471 122.409 161.013 122.409H165.789C166.331 122.409 166.266 122.203 166.628 122.203C167.144 122.203 167.635 123.545 167.635 124.552C167.635 125.029 167.48 125.339 167.234 125.339C166.976 125.339 166.821 125.055 166.628 124.319C166.537 124.01 166.46 123.79 166.318 123.571C166.189 123.338 165.479 123.261 164.679 123.261H164.395C164.188 123.313 164.163 124.061 164.163 125.016V129.353C164.163 130.076 164.227 130.682 164.408 130.734C165.182 130.773 165.466 130.863 165.466 131.147C165.466 131.508 164.769 131.637 163.401 131.637ZM170.431 131.766C168.443 131.766 167.088 130.36 167.088 128.398C167.088 126.384 168.585 124.978 170.65 124.978C172.625 124.978 173.993 126.384 173.993 128.346C173.993 130.398 172.457 131.766 170.431 131.766ZM168.52 127.817C168.52 129.366 169.45 131.044 170.844 131.044C171.824 131.044 172.573 130.231 172.573 128.927C172.573 127.365 171.605 125.7 170.237 125.7C169.269 125.7 168.52 126.488 168.52 127.817ZM177.398 131.754C175.862 131.754 174.726 130.411 174.726 128.475C174.726 126.384 175.978 124.99 177.798 124.99C178.65 124.99 179.321 125.313 179.76 125.804V124.655C179.76 124.074 179.682 123.325 179.476 123.235C178.779 123.209 178.559 123.054 178.559 122.874C178.559 122.719 178.65 122.616 178.856 122.525C179.36 122.28 180.379 122.074 180.741 122.074C181.115 122.074 181.192 122.319 181.192 122.783C181.192 123.235 181.18 123.932 181.18 124.861V129.121C181.18 129.753 181.205 130.463 181.36 130.54C182.018 130.579 182.199 130.721 182.199 130.902C182.199 131.031 182.122 131.134 181.928 131.237C181.451 131.47 180.56 131.676 180.224 131.676C179.85 131.676 179.773 131.431 179.773 130.966C179.773 130.786 179.786 130.502 179.786 130.166C179.411 131.095 178.508 131.754 177.398 131.754ZM176.236 128.282C176.236 129.908 176.959 130.798 177.94 130.798C178.882 130.798 179.798 130.011 179.773 128.114C179.76 126.384 178.998 125.687 178.043 125.687C176.869 125.687 176.236 126.72 176.236 128.282ZM185.364 131.754C183.828 131.754 182.692 130.411 182.692 128.475C182.692 126.384 183.944 124.99 185.764 124.99C186.616 124.99 187.287 125.313 187.726 125.804V124.655C187.726 124.074 187.648 123.325 187.442 123.235C186.745 123.209 186.525 123.054 186.525 122.874C186.525 122.719 186.616 122.616 186.822 122.525C187.325 122.28 188.345 122.074 188.707 122.074C189.081 122.074 189.158 122.319 189.158 122.783C189.158 123.235 189.145 123.932 189.145 124.861V129.121C189.145 129.753 189.171 130.463 189.326 130.54C189.984 130.579 190.165 130.721 190.165 130.902C190.165 131.031 190.088 131.134 189.894 131.237C189.416 131.47 188.526 131.676 188.19 131.676C187.816 131.676 187.739 131.431 187.739 130.966C187.739 130.786 187.751 130.502 187.751 130.166C187.377 131.095 186.474 131.754 185.364 131.754ZM184.202 128.282C184.202 129.908 184.925 130.798 185.906 130.798C186.848 130.798 187.764 130.011 187.739 128.114C187.726 126.384 186.964 125.687 186.009 125.687C184.835 125.687 184.202 126.72 184.202 128.282ZM198.239 131.766C195.813 131.766 193.735 129.74 193.735 127.017C193.735 124.242 195.774 122.203 198.317 122.203C199.169 122.203 199.892 122.461 200.434 122.693C200.653 122.796 200.756 122.835 200.872 122.835C201.092 122.835 201.143 122.693 201.389 122.693C201.905 122.693 202.215 123.919 202.215 124.836C202.215 125.674 201.982 125.997 201.724 125.997C201.402 125.997 201.298 125.61 201.079 124.874C200.743 123.79 199.44 123.106 198.33 123.093C196.523 123.093 195.361 124.526 195.361 126.501C195.361 128.63 196.781 130.644 198.846 130.644C199.853 130.644 200.782 130.218 201.273 129.405C201.531 128.953 201.66 128.398 201.944 128.398C202.163 128.398 202.292 128.604 202.292 129.004C202.292 129.921 201.66 131.366 201.143 131.366C200.872 131.366 200.872 131.211 200.627 131.211C200.524 131.211 200.369 131.276 200.201 131.366C199.814 131.534 199.195 131.766 198.239 131.766ZM204.684 131.637C203.638 131.637 203.058 131.508 203.058 131.16C203.058 130.902 203.316 130.824 203.806 130.798C203.961 130.734 203.974 130.347 203.974 129.443V124.642C203.974 124.048 203.948 123.3 203.793 123.222C203.109 123.184 202.916 123.042 202.916 122.861C202.916 122.719 202.993 122.616 203.174 122.525C203.677 122.28 204.606 122.074 204.968 122.074C205.342 122.074 205.42 122.319 205.42 122.783C205.42 123.235 205.394 123.958 205.394 124.874V129.443C205.394 130.295 205.42 130.734 205.562 130.798C206.065 130.837 206.31 130.902 206.31 131.16C206.31 131.521 205.678 131.637 204.684 131.637ZM208.391 134.064C207.604 134.064 207.062 133.548 207.062 132.954C207.062 132.45 207.397 132.089 207.849 132.089C208.288 132.089 208.533 132.373 208.572 132.786C208.572 132.902 208.572 133.005 208.585 133.096C208.585 133.186 208.649 133.264 208.778 133.264C209.127 133.264 209.372 132.902 209.578 132.309C209.682 131.986 209.604 131.676 209.243 130.915C208.791 129.934 207.939 127.985 207.462 126.797C207.229 126.217 207.139 126.036 207.01 125.984C206.597 125.946 206.352 125.829 206.352 125.597C206.352 125.261 206.933 125.107 208.055 125.107C209.191 125.107 209.707 125.274 209.707 125.597C209.707 125.855 209.449 125.946 208.92 125.971C208.817 126.088 208.946 126.642 209.127 127.185C209.462 128.14 210.056 129.417 210.469 130.269C210.882 129.275 211.347 127.869 211.566 127.056C211.682 126.655 211.811 126.088 211.682 125.946C211.127 125.907 210.895 125.829 210.895 125.584C210.895 125.274 211.489 125.107 212.34 125.107C213.154 125.107 213.67 125.287 213.67 125.571C213.67 125.829 213.425 125.907 212.999 125.958C212.766 126.075 212.637 126.359 212.431 126.939C211.837 128.591 211.514 129.572 210.959 131.031C210.262 132.902 209.746 134.064 208.391 134.064ZM216.395 131.754C214.859 131.754 213.723 130.411 213.723 128.475C213.723 126.384 214.975 124.99 216.795 124.99C217.647 124.99 218.318 125.313 218.757 125.804V124.655C218.757 124.074 218.68 123.325 218.473 123.235C217.776 123.209 217.557 123.054 217.557 122.874C217.557 122.719 217.647 122.616 217.854 122.525C218.357 122.28 219.377 122.074 219.738 122.074C220.112 122.074 220.19 122.319 220.19 122.783C220.19 123.235 220.177 123.932 220.177 124.861V129.121C220.177 129.753 220.203 130.463 220.357 130.54C221.016 130.579 221.196 130.721 221.196 130.902C221.196 131.031 221.119 131.134 220.925 131.237C220.448 131.47 219.557 131.676 219.222 131.676C218.847 131.676 218.77 131.431 218.77 130.966C218.77 130.786 218.783 130.502 218.783 130.166C218.409 131.095 217.505 131.754 216.395 131.754ZM215.234 128.282C215.234 129.908 215.956 130.798 216.937 130.798C217.879 130.798 218.796 130.011 218.77 128.114C218.757 126.384 217.996 125.687 217.04 125.687C215.866 125.687 215.234 126.72 215.234 128.282ZM224.735 131.766C222.915 131.766 221.689 130.437 221.689 128.514C221.689 126.423 223.161 124.99 224.955 124.99C226.581 124.99 227.601 126.126 227.601 127.249C227.601 127.817 227.317 128.217 226.813 128.217H222.993C223.07 129.598 223.871 130.502 225.161 130.502C226.065 130.502 226.633 130.05 227.007 129.676C227.136 129.559 227.239 129.456 227.368 129.456C227.536 129.456 227.639 129.572 227.639 129.792C227.639 130.024 227.497 130.36 227.213 130.669C226.749 131.224 225.91 131.766 224.735 131.766ZM223.032 127.507L225.703 127.481C226.116 127.481 226.336 127.339 226.336 126.978C226.336 126.294 225.781 125.674 224.877 125.674C223.883 125.674 223.186 126.397 223.032 127.507Z" fill="white"/>
+<path d="M160.724 143.968C159.969 143.968 159.709 143.586 159.709 142.976V140.803H159.145V140.162H159.366C159.603 140.162 159.709 140.055 159.709 139.819V139.125H160.419V140.162H161.273V140.803H160.419V142.824C160.419 143.144 160.495 143.319 160.899 143.319C161.044 143.319 161.143 143.304 161.273 143.266V143.891C161.09 143.937 160.907 143.968 160.724 143.968ZM163.48 143.991C162.413 143.991 161.703 143.22 161.703 142.03C161.703 140.848 162.413 140.078 163.48 140.078C164.548 140.078 165.25 140.848 165.25 142.03C165.25 143.22 164.548 143.991 163.48 143.991ZM163.48 143.35C164.144 143.35 164.533 142.892 164.533 142.03C164.533 141.169 164.144 140.719 163.48 140.719C162.809 140.719 162.42 141.169 162.42 142.03C162.42 142.892 162.809 143.35 163.48 143.35ZM167.522 143.991C166.515 143.991 165.859 143.22 165.859 142.03C165.859 140.848 166.53 140.078 167.522 140.078C168.018 140.078 168.338 140.231 168.666 140.62V138.568H169.375V143.907H168.696V143.403C168.346 143.815 168.018 143.991 167.522 143.991ZM167.621 143.35C168.292 143.35 168.681 142.892 168.681 142.03C168.681 141.169 168.292 140.719 167.621 140.719C166.957 140.719 166.561 141.169 166.561 142.03C166.561 142.892 166.957 143.35 167.621 143.35ZM171.916 143.991C170.909 143.991 170.254 143.22 170.254 142.03C170.254 140.848 170.925 140.078 171.916 140.078C172.412 140.078 172.732 140.231 173.06 140.62V138.568H173.769V143.907H173.091V143.403C172.74 143.815 172.412 143.991 171.916 143.991ZM172.015 143.35C172.686 143.35 173.075 142.892 173.075 142.03C173.075 141.169 172.686 140.719 172.015 140.719C171.352 140.719 170.955 141.169 170.955 142.03C170.955 142.892 171.352 143.35 172.015 143.35ZM177.63 144.868C176.387 144.868 174.724 144.196 174.724 142.03C174.724 140.192 176.181 138.484 178.126 138.484C179.72 138.484 180.734 139.437 180.734 140.909C180.734 142.122 180.009 143.327 179.041 143.327C178.576 143.327 178.354 143.129 178.278 142.801C177.95 143.213 177.66 143.319 177.287 143.319C176.631 143.319 176.143 142.824 176.143 142.061C176.143 140.879 176.882 139.994 177.752 139.994C178.179 139.994 178.476 140.192 178.598 140.497L178.667 140.124H179.262L178.865 142.091C178.827 142.267 178.797 142.427 178.797 142.557C178.797 142.778 178.881 142.908 179.132 142.908C179.62 142.908 180.253 142.114 180.253 140.909C180.253 139.651 179.422 138.896 178.095 138.896C176.516 138.896 175.205 140.299 175.205 142.038C175.205 143.83 176.493 144.456 177.645 144.456C178.415 144.456 179.193 144.227 179.697 143.556H180.261C179.643 144.463 178.698 144.868 177.63 144.868ZM177.378 142.778C177.912 142.778 178.392 142.114 178.392 141.291C178.392 140.818 178.179 140.528 177.775 140.528C177.241 140.528 176.791 141.199 176.791 142.023C176.791 142.45 177.004 142.778 177.378 142.778ZM184.805 141.916V142.168H182.113C182.151 142.976 182.578 143.365 183.173 143.365C183.638 143.365 183.897 143.197 184.057 142.816H184.79C184.515 143.655 183.874 143.991 183.173 143.991C182.12 143.991 181.388 143.22 181.388 142.03C181.388 140.734 182.174 140.078 183.15 140.078C184.164 140.078 184.805 140.848 184.805 141.916ZM182.136 141.634H184.065C184.019 140.993 183.691 140.688 183.15 140.688C182.608 140.688 182.235 140.986 182.136 141.634ZM185.908 143.907H185.107L186.381 141.985L185.176 140.162H185.992L186.8 141.428L187.601 140.162H188.402L187.189 141.969L188.471 143.907H187.655L186.77 142.526L185.908 143.907ZM189.85 145.562H189.14V140.162H189.819V140.65C190.139 140.246 190.498 140.078 190.994 140.078C192 140.078 192.656 140.848 192.656 142.03C192.656 143.22 191.985 143.991 190.994 143.991C190.498 143.991 190.139 143.823 189.85 143.441V145.562ZM190.894 143.35C191.558 143.35 191.954 142.892 191.954 142.03C191.954 141.169 191.558 140.719 190.894 140.719C190.223 140.719 189.834 141.169 189.834 142.03C189.834 142.892 190.223 143.35 190.894 143.35ZM196.684 141.916V142.168H193.992C194.03 142.976 194.457 143.365 195.052 143.365C195.517 143.365 195.777 143.197 195.937 142.816H196.669C196.395 143.655 195.754 143.991 195.052 143.991C194 143.991 193.268 143.22 193.268 142.03C193.268 140.734 194.053 140.078 195.029 140.078C196.044 140.078 196.684 140.848 196.684 141.916ZM194.015 141.634H195.945C195.899 140.993 195.571 140.688 195.029 140.688C194.488 140.688 194.114 140.986 194.015 141.634ZM198.258 143.907H197.549V140.162H198.228V140.65C198.518 140.246 198.853 140.078 199.372 140.078C200.241 140.078 200.676 140.566 200.676 141.619V143.907H199.967V141.68C199.967 141.008 199.745 140.726 199.212 140.726C198.533 140.726 198.258 141.184 198.258 141.947V143.907ZM203.061 143.991C202.138 143.991 201.581 143.571 201.474 142.785H202.199C202.283 143.22 202.58 143.396 203.076 143.396C203.61 143.396 203.9 143.258 203.9 142.9C203.9 142.618 203.709 142.473 203.19 142.351L202.863 142.275C201.955 142.061 201.596 141.733 201.596 141.161C201.596 140.467 202.13 140.078 203.015 140.078C203.923 140.078 204.472 140.482 204.548 141.23H203.823C203.762 140.825 203.488 140.673 203.03 140.673C202.565 140.673 202.306 140.795 202.306 141.123C202.306 141.39 202.481 141.535 202.977 141.649L203.312 141.725C204.22 141.931 204.609 142.259 204.609 142.854C204.609 143.579 204.029 143.991 203.061 143.991ZM205.817 139.422C205.581 139.422 205.405 139.239 205.405 139.003C205.405 138.774 205.581 138.591 205.817 138.591C206.053 138.591 206.229 138.774 206.229 139.003C206.229 139.239 206.053 139.422 205.817 139.422ZM206.168 143.907H205.459V140.162H206.168V143.907ZM208.152 143.907H207.45V140.803H206.886V140.162H207.443V139.506C207.443 138.858 207.847 138.484 208.556 138.484C208.716 138.484 208.869 138.507 209.014 138.545V139.186C208.899 139.148 208.793 139.132 208.678 139.132C208.335 139.132 208.152 139.247 208.152 139.62V140.162H208.938V140.803H208.152V143.907ZM209.894 145.638C209.711 145.638 209.558 145.623 209.421 145.584L209.467 144.967C209.589 145.005 209.696 145.02 209.803 145.02C210.092 145.02 210.237 144.921 210.367 144.555L210.619 143.846L209.2 140.162H209.947L210.992 142.999L211.969 140.162H212.693L211.008 144.707C210.748 145.401 210.474 145.638 209.894 145.638ZM213.247 143.929C212.972 143.929 212.789 143.724 212.789 143.457C212.789 143.197 212.972 142.991 213.247 142.991C213.521 142.991 213.704 143.197 213.704 143.457C213.704 143.724 213.521 143.929 213.247 143.929ZM215.876 143.991C214.816 143.991 214.122 143.22 214.122 142.03C214.122 140.848 214.816 140.078 215.876 140.078C216.707 140.078 217.348 140.543 217.523 141.367H216.799C216.646 140.925 216.326 140.719 215.876 140.719C215.22 140.719 214.823 141.176 214.823 142.03C214.823 142.885 215.22 143.35 215.876 143.35C216.333 143.35 216.661 143.152 216.806 142.648H217.531C217.355 143.495 216.722 143.991 215.876 143.991ZM219.816 143.991C218.749 143.991 218.039 143.22 218.039 142.03C218.039 140.848 218.749 140.078 219.816 140.078C220.884 140.078 221.586 140.848 221.586 142.03C221.586 143.22 220.884 143.991 219.816 143.991ZM219.816 143.35C220.48 143.35 220.869 142.892 220.869 142.03C220.869 141.169 220.48 140.719 219.816 140.719C219.145 140.719 218.756 141.169 218.756 142.03C218.756 142.892 219.145 143.35 219.816 143.35ZM226.558 140.078C227.42 140.078 227.854 140.566 227.854 141.619V143.907H227.145V141.664C227.145 141.008 226.939 140.726 226.428 140.726C225.78 140.726 225.513 141.184 225.513 141.977V143.907H224.804V141.664C224.804 141.008 224.59 140.726 224.087 140.726C223.431 140.726 223.171 141.184 223.171 141.977V143.907H222.462V140.162H223.141V140.65C223.431 140.246 223.743 140.078 224.239 140.078C224.765 140.078 225.139 140.284 225.345 140.742C225.604 140.299 226.024 140.078 226.558 140.078Z" fill="#AFBBB0"/>
+<rect width="220" height="37.5467" transform="translate(84 163.333)" fill="#061B09"/>
+<path d="M102.773 181.436H106.796V177.413H102.773V181.436ZM104.114 178.754H105.455V180.095H104.114V178.754ZM108.137 177.413V181.436H112.16V177.413H108.137ZM110.819 180.095H109.478V178.754H110.819V180.095ZM102.773 186.8H106.796V182.777H102.773V186.8ZM104.114 184.118H105.455V185.459H104.114V184.118ZM111.49 182.777H112.16V185.459H110.149V184.789H109.478V186.8H108.137V182.777H110.149V183.448H111.49V182.777ZM111.49 186.13H112.16V186.8H111.49V186.13ZM110.149 186.13H110.819V186.8H110.149V186.13Z" fill="#03D47C"/>
+<path d="M129.109 184.212C127.498 184.212 126.522 183.464 126.495 182.074H127.727C127.754 182.787 128.194 183.147 129.109 183.147C129.857 183.147 130.35 182.901 130.35 182.382C130.35 182.003 130.165 181.81 129.364 181.625L128.546 181.449C127.182 181.141 126.654 180.639 126.654 179.663C126.654 178.659 127.41 177.841 128.959 177.841C130.543 177.841 131.362 178.615 131.423 179.856H130.191C130.156 179.24 129.76 178.906 128.959 178.906C128.299 178.906 127.894 179.126 127.894 179.566C127.894 179.935 128.07 180.12 128.862 180.296L129.672 180.481C131.054 180.798 131.59 181.299 131.59 182.276C131.59 183.57 130.552 184.212 129.109 184.212ZM133.594 184.107H132.406V177.947H133.594V180.27C133.875 179.856 134.28 179.671 134.79 179.671C135.829 179.671 136.357 180.217 136.357 181.528V184.107H135.178V181.625C135.178 180.921 134.931 180.683 134.438 180.683C133.893 180.683 133.594 181.053 133.594 181.748V184.107ZM139.229 179.671C140.523 179.671 141.086 180.208 141.086 181.493V184.107H139.969V183.543C139.713 183.922 139.291 184.212 138.675 184.212C137.742 184.212 137.161 183.737 137.161 182.954C137.161 182.065 137.918 181.59 139.08 181.59C139.414 181.59 139.661 181.616 139.907 181.669V181.326C139.907 180.789 139.669 180.56 139.185 180.56C138.719 180.56 138.473 180.807 138.446 181.15H137.267C137.355 180.147 138.173 179.671 139.229 179.671ZM139.001 183.315C139.476 183.315 139.907 182.98 139.907 182.452V182.399C139.687 182.338 139.493 182.311 139.185 182.311C138.657 182.311 138.341 182.479 138.341 182.839C138.341 183.139 138.543 183.315 139.001 183.315ZM143.296 184.107H142.108V179.768H143.226V180.402C143.481 179.9 143.868 179.715 144.273 179.715C144.378 179.715 144.528 179.724 144.625 179.751V180.851C144.44 180.824 144.334 180.815 144.185 180.815C143.622 180.815 143.296 181.185 143.296 181.977V184.107ZM149.231 181.959V182.179H146.187C146.257 182.927 146.644 183.253 147.172 183.253C147.691 183.253 147.92 183.024 148.026 182.716H149.231C148.906 183.878 147.991 184.212 147.172 184.212C145.843 184.212 144.972 183.323 144.972 181.933C144.972 180.305 146.055 179.671 147.128 179.671C148.483 179.671 149.231 180.648 149.231 181.959ZM146.213 181.449H147.982C147.929 180.851 147.621 180.578 147.128 180.578C146.688 180.578 146.327 180.815 146.213 181.449ZM154.106 184.212C152.812 184.212 151.967 183.323 151.967 181.933C151.967 180.56 152.839 179.671 154.141 179.671C155.206 179.671 156.024 180.208 156.165 181.308H154.959C154.81 180.868 154.528 180.657 154.106 180.657C153.516 180.657 153.147 181.115 153.147 181.933C153.147 182.751 153.507 183.218 154.106 183.218C154.537 183.218 154.854 182.98 154.977 182.496H156.174C155.998 183.57 155.206 184.212 154.106 184.212ZM158.79 184.212C157.479 184.212 156.617 183.323 156.617 181.933C156.617 180.56 157.479 179.671 158.79 179.671C160.11 179.671 160.964 180.56 160.964 181.933C160.964 183.323 160.11 184.212 158.79 184.212ZM158.79 183.218C159.406 183.218 159.776 182.751 159.776 181.933C159.776 181.115 159.406 180.657 158.79 180.657C158.165 180.657 157.796 181.115 157.796 181.933C157.796 182.751 158.165 183.218 158.79 183.218ZM163.434 184.212C162.255 184.212 161.498 183.323 161.498 181.933C161.498 180.56 162.29 179.671 163.434 179.671C163.936 179.671 164.314 179.839 164.622 180.173V177.947H165.801V184.107H164.692V183.605C164.34 184.01 163.944 184.212 163.434 184.212ZM163.663 183.218C164.288 183.218 164.657 182.76 164.657 181.933C164.657 181.115 164.288 180.657 163.663 180.657C163.047 180.657 162.677 181.115 162.677 181.933C162.677 182.76 163.047 183.218 163.663 183.218ZM170.879 181.959V182.179H167.834C167.905 182.927 168.292 183.253 168.82 183.253C169.339 183.253 169.568 183.024 169.673 182.716H170.879C170.553 183.878 169.638 184.212 168.82 184.212C167.491 184.212 166.62 183.323 166.62 181.933C166.62 180.305 167.702 179.671 168.776 179.671C170.131 179.671 170.879 180.648 170.879 181.959ZM167.861 181.449H169.629C169.577 180.851 169.269 180.578 168.776 180.578C168.336 180.578 167.975 180.815 167.861 181.449Z" fill="#E7ECE9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M283.224 177.17C283.682 176.712 284.425 176.712 284.883 177.17L289.819 182.107L284.883 187.043C284.425 187.501 283.682 187.501 283.224 187.043C282.765 186.585 282.765 185.842 283.224 185.384L286.501 182.107L283.224 178.83C282.765 178.371 282.765 177.629 283.224 177.17Z" fill="#8B9C8F"/>
+<rect width="220" height="37.5467" transform="translate(84 200.88)" fill="#061B09"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M103.36 215.409C103.36 214.837 103.824 214.373 104.395 214.373H110.538C111.11 214.373 111.573 214.837 111.573 215.409V223.898C111.573 224.47 111.11 224.933 110.538 224.933H108.64V223.047C108.64 222.793 108.434 222.587 108.18 222.587H106.753C106.499 222.587 106.293 222.793 106.293 223.047V224.933H104.395C103.824 224.933 103.36 224.47 103.36 223.898V215.409ZM105.644 215.547C105.32 215.547 105.057 215.809 105.057 216.133C105.057 216.457 105.32 216.72 105.644 216.72H109.294C109.618 216.72 109.881 216.457 109.881 216.133C109.881 215.809 109.618 215.547 109.294 215.547H105.644ZM105.057 218.48C105.057 218.156 105.32 217.893 105.644 217.893H109.294C109.618 217.893 109.881 218.156 109.881 218.48C109.881 218.804 109.618 219.067 109.294 219.067H105.644C105.32 219.067 105.057 218.804 105.057 218.48ZM105.644 220.24C105.32 220.24 105.057 220.503 105.057 220.827C105.057 221.151 105.32 221.413 105.644 221.413H109.294C109.618 221.413 109.881 221.151 109.881 220.827C109.881 220.503 109.618 220.24 109.294 220.24H105.644Z" fill="#03D47C"/>
+<path d="M129.206 221.653H127.921L126.275 215.493H127.569L128.607 219.92L129.822 215.493H131.027L132.242 219.92L133.28 215.493H134.556L132.91 221.653H131.626L130.402 217.306L129.206 221.653ZM136.636 221.759C135.324 221.759 134.462 220.87 134.462 219.48C134.462 218.107 135.324 217.218 136.636 217.218C137.956 217.218 138.809 218.107 138.809 219.48C138.809 220.87 137.956 221.759 136.636 221.759ZM136.636 220.764C137.252 220.764 137.621 220.298 137.621 219.48C137.621 218.661 137.252 218.204 136.636 218.204C136.011 218.204 135.641 218.661 135.641 219.48C135.641 220.298 136.011 220.764 136.636 220.764ZM140.795 221.653H139.607V217.315H140.725V217.948C140.98 217.447 141.367 217.262 141.772 217.262C141.878 217.262 142.027 217.271 142.124 217.297V218.397C141.939 218.371 141.834 218.362 141.684 218.362C141.121 218.362 140.795 218.732 140.795 219.524V221.653ZM146.993 221.653H145.532L144.371 220.052L143.992 220.448V221.653H142.804V215.493H143.992V218.996L145.559 217.315H146.949L145.145 219.224L146.993 221.653ZM149.126 221.759C147.929 221.759 147.234 221.248 147.137 220.263H148.307C148.378 220.703 148.65 220.888 149.161 220.888C149.627 220.888 149.891 220.756 149.891 220.456C149.891 220.228 149.724 220.087 149.266 219.99L148.906 219.902C147.77 219.647 147.278 219.295 147.278 218.573C147.278 217.676 147.946 217.218 149.055 217.218C150.278 217.218 150.947 217.711 151 218.67H149.838C149.812 218.248 149.557 218.08 149.099 218.08C148.686 218.08 148.448 218.204 148.448 218.494C148.448 218.714 148.606 218.855 149.055 218.952L149.425 219.031C150.551 219.286 151.062 219.647 151.062 220.377C151.062 221.284 150.331 221.759 149.126 221.759ZM153.041 223.528H151.853V217.315H152.971V217.816C153.305 217.412 153.719 217.218 154.229 217.218C155.409 217.218 156.165 218.107 156.165 219.48C156.165 220.87 155.373 221.759 154.221 221.759C153.719 221.759 153.323 221.574 153.041 221.248V223.528ZM153.992 220.764C154.617 220.764 154.986 220.307 154.986 219.48C154.986 218.652 154.617 218.204 153.992 218.204C153.376 218.204 153.006 218.652 153.006 219.48C153.006 220.307 153.376 220.764 153.992 220.764ZM158.823 217.218C160.117 217.218 160.68 217.755 160.68 219.04V221.653H159.562V221.09C159.307 221.468 158.885 221.759 158.269 221.759C157.336 221.759 156.755 221.284 156.755 220.5C156.755 219.612 157.512 219.136 158.674 219.136C159.008 219.136 159.254 219.163 159.501 219.216V218.872C159.501 218.336 159.263 218.107 158.779 218.107C158.313 218.107 158.066 218.353 158.04 218.696H156.861C156.949 217.693 157.767 217.218 158.823 217.218ZM158.594 220.861C159.07 220.861 159.501 220.527 159.501 219.999V219.946C159.281 219.884 159.087 219.858 158.779 219.858C158.251 219.858 157.934 220.025 157.934 220.386C157.934 220.685 158.137 220.861 158.594 220.861ZM163.576 221.759C162.283 221.759 161.438 220.87 161.438 219.48C161.438 218.107 162.309 217.218 163.611 217.218C164.676 217.218 165.495 217.755 165.635 218.855H164.43C164.28 218.415 163.999 218.204 163.576 218.204C162.987 218.204 162.617 218.661 162.617 219.48C162.617 220.298 162.978 220.764 163.576 220.764C164.007 220.764 164.324 220.527 164.447 220.043H165.644C165.468 221.116 164.676 221.759 163.576 221.759ZM170.346 219.506V219.726H167.301C167.372 220.474 167.759 220.8 168.287 220.8C168.806 220.8 169.035 220.571 169.141 220.263H170.346C170.021 221.424 169.105 221.759 168.287 221.759C166.958 221.759 166.087 220.87 166.087 219.48C166.087 217.852 167.169 217.218 168.243 217.218C169.598 217.218 170.346 218.195 170.346 219.506ZM167.328 218.996H169.097C169.044 218.397 168.736 218.124 168.243 218.124C167.803 218.124 167.442 218.362 167.328 218.996ZM172.819 221.759C171.622 221.759 170.927 221.248 170.83 220.263H172C172.071 220.703 172.343 220.888 172.854 220.888C173.32 220.888 173.584 220.756 173.584 220.456C173.584 220.228 173.417 220.087 172.959 219.99L172.599 219.902C171.463 219.647 170.971 219.295 170.971 218.573C170.971 217.676 171.639 217.218 172.748 217.218C173.971 217.218 174.64 217.711 174.693 218.67H173.531C173.505 218.248 173.25 218.08 172.792 218.08C172.379 218.08 172.141 218.204 172.141 218.494C172.141 218.714 172.299 218.855 172.748 218.952L173.118 219.031C174.244 219.286 174.755 219.647 174.755 220.377C174.755 221.284 174.024 221.759 172.819 221.759Z" fill="#E7ECE9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M283.224 214.717C283.682 214.259 284.425 214.259 284.883 214.717L289.819 219.653L284.883 224.59C284.425 225.048 283.682 225.048 283.224 224.59C282.765 224.131 282.765 223.389 283.224 222.93L286.501 219.653L283.224 216.376C282.765 215.918 282.765 215.175 283.224 214.717Z" fill="#8B9C8F"/>
+<rect width="220" height="37.5467" transform="translate(84 238.427)" fill="#061B09"/>
+<g clip-path="url(#clip3_1626_5856)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M110.954 259.369C111.347 258.74 111.573 257.996 111.573 257.2C111.573 254.932 109.735 253.093 107.467 253.093C105.199 253.093 103.36 254.932 103.36 257.2C103.36 257.996 103.587 258.739 103.979 259.369C104.788 258.406 106.049 257.787 107.466 257.787C108.884 257.787 110.145 258.406 110.954 259.369ZM112.747 257.2C112.747 260.116 110.383 262.48 107.467 262.48C104.551 262.48 102.187 260.116 102.187 257.2C102.187 254.284 104.551 251.92 107.467 251.92C110.383 251.92 112.747 254.284 112.747 257.2ZM107.467 257.2C108.439 257.2 109.227 256.412 109.227 255.44C109.227 254.468 108.439 253.68 107.467 253.68C106.495 253.68 105.707 254.468 105.707 255.44C105.707 256.412 106.495 257.2 107.467 257.2Z" fill="#03D47C"/>
+</g>
+<path d="M128.114 259.2H126.882V253.04H129.346C130.71 253.04 131.608 253.814 131.608 255.134C131.608 256.454 130.71 257.238 129.346 257.238H128.114V259.2ZM128.114 254.166V256.111H129.364C130.006 256.111 130.376 255.742 130.376 255.134C130.376 254.536 130.006 254.166 129.364 254.166H128.114ZM133.568 259.2H132.38V254.862H133.498V255.495C133.753 254.994 134.14 254.809 134.545 254.809C134.65 254.809 134.8 254.818 134.897 254.844V255.944C134.712 255.918 134.606 255.909 134.457 255.909C133.894 255.909 133.568 256.278 133.568 257.07V259.2ZM137.418 259.306C136.106 259.306 135.244 258.417 135.244 257.026C135.244 255.654 136.106 254.765 137.418 254.765C138.738 254.765 139.591 255.654 139.591 257.026C139.591 258.417 138.738 259.306 137.418 259.306ZM137.418 258.311C138.034 258.311 138.403 257.845 138.403 257.026C138.403 256.208 138.034 255.75 137.418 255.75C136.793 255.75 136.423 256.208 136.423 257.026C136.423 257.845 136.793 258.311 137.418 258.311ZM141.727 259.2H140.548V255.847H139.94V254.862H140.548V254.184C140.548 253.357 141.111 252.934 141.929 252.934C142.176 252.934 142.396 252.97 142.616 253.031V254.008C142.484 253.964 142.36 253.946 142.228 253.946C141.912 253.946 141.727 254.043 141.727 254.422V254.862H142.572V255.847H141.727V259.2ZM143.781 254.202C143.411 254.202 143.138 253.92 143.138 253.568C143.138 253.216 143.411 252.943 143.781 252.943C144.15 252.943 144.423 253.216 144.423 253.568C144.423 253.92 144.15 254.202 143.781 254.202ZM144.37 259.2H143.182V254.862H144.37V259.2ZM146.683 259.253C145.821 259.253 145.442 258.866 145.442 258.082V253.04H146.63V257.81C146.63 258.118 146.71 258.258 146.991 258.258C147.035 258.258 147.088 258.258 147.141 258.25V259.2C147.026 259.226 146.886 259.253 146.683 259.253ZM151.801 257.053V257.273H148.756C148.826 258.021 149.214 258.346 149.742 258.346C150.261 258.346 150.49 258.118 150.595 257.81H151.801C151.475 258.971 150.56 259.306 149.742 259.306C148.413 259.306 147.542 258.417 147.542 257.026C147.542 255.398 148.624 254.765 149.698 254.765C151.053 254.765 151.801 255.742 151.801 257.053ZM148.782 256.542H150.551C150.498 255.944 150.19 255.671 149.698 255.671C149.258 255.671 148.897 255.909 148.782 256.542Z" fill="#E7ECE9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M283.224 252.264C283.682 251.805 284.425 251.805 284.883 252.264L289.819 257.2L284.883 262.136C284.425 262.594 283.682 262.594 283.224 262.136C282.765 261.678 282.765 260.935 283.224 260.477L286.501 257.2L283.224 253.923C282.765 253.465 282.765 252.722 283.224 252.264Z" fill="#8B9C8F"/>
+</g>
+<rect x="82.8267" y="18.8267" width="222.347" height="478.72" rx="15.2533" stroke="#061B09" stroke-width="2.34667"/>
+</g>
+<rect x="1.5" y="1" width="384.5" height="262" stroke="#1A3D32" stroke-width="2"/>
+<defs>
+<clipPath id="clip0_1626_5856">
+<rect x="0.5" width="386.5" height="264" fill="white"/>
+</clipPath>
+<clipPath id="clip1_1626_5856">
+<rect x="84" y="20" width="220" height="476.373" rx="14.08" fill="white"/>
+</clipPath>
+<clipPath id="clip2_1626_5856">
+<rect x="170.533" y="62.24" width="46.9333" height="46.9333" rx="23.4667" fill="white"/>
+</clipPath>
+<clipPath id="clip3_1626_5856">
+<rect width="11.7333" height="11.7333" fill="white" transform="translate(101.6 251.333)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/docs/assets/images/settings-old-dot.svg b/docs/assets/images/settings-old-dot.svg
new file mode 100644
index 000000000000..89302b65c70d
--- /dev/null
+++ b/docs/assets/images/settings-old-dot.svg
@@ -0,0 +1,187 @@
+<svg width="387" height="264" viewBox="0 0 387 264" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1626_5832)">
+<rect width="386.5" height="264" fill="#1A3D32"/>
+<g clip-path="url(#clip1_1626_5832)">
+<g clip-path="url(#clip2_1626_5832)">
+<rect width="34.6667" height="390.963" transform="translate(20 20)" fill="#07271F"/>
+<g clip-path="url(#clip3_1626_5832)">
+<rect x="27.7037" y="27.7037" width="19.2593" height="19.2593" rx="9.62963" fill="white"/>
+<path d="M46.9629 27.7037H27.7037V46.963H46.9629V27.7037Z" fill="#03D47C"/>
+<path d="M31.8444 36.1056C31.8444 36.1056 31.4592 37.0445 30.8092 37.1167C30.8092 37.1167 31.7 37.5019 31.7722 38.0797C31.7722 38.0797 32.1333 37.2371 32.8315 37.1408C32.8315 37.1408 31.8926 36.9241 31.8444 36.1056Z" fill="#008C59"/>
+<path d="M43.1592 38.2482C43.1592 38.2482 42.774 39.1871 42.124 39.2593C42.124 39.2593 43.0148 39.6445 43.087 40.2222C43.087 40.2222 43.4481 39.3797 44.1463 39.2834C44.1703 39.2834 43.2074 39.0667 43.1592 38.2482Z" fill="#008C59"/>
+<path d="M37.3092 45.1334C32.9759 45.1334 29.437 41.5945 29.437 37.2611C29.437 32.9278 32.9759 29.3889 37.3092 29.3889C41.6426 29.3889 45.1815 32.9278 45.1815 37.2611C45.1815 41.6185 41.6426 45.1334 37.3092 45.1334ZM37.3092 29.6297C33.0963 29.6297 29.6778 33.0722 29.6778 37.2611C29.6778 41.45 33.0963 44.8926 37.3092 44.8926C41.5222 44.8926 44.9407 41.4741 44.9407 37.2611C44.9407 33.0482 41.5222 29.6297 37.3092 29.6297Z" fill="#002140"/>
+<path d="M43.1352 40.463C43.087 40.463 43.0389 40.4149 43.0148 40.3667C42.8222 39.6686 42.7018 39.5482 42.0037 39.3556C41.9555 39.3315 41.9074 39.2834 41.9074 39.2352C41.9074 39.1871 41.9555 39.1389 42.0037 39.1149C42.7018 38.9223 42.8222 38.8019 43.0148 38.1037C43.0389 38.0556 43.087 38.0074 43.1352 38.0074C43.1833 38.0074 43.2315 38.0556 43.2555 38.1037C43.4481 38.8019 43.5685 38.9223 44.2666 39.1149C44.3148 39.1389 44.3629 39.1871 44.3629 39.2352C44.3629 39.2834 44.3148 39.3315 44.2666 39.3556C43.5685 39.5482 43.4481 39.6686 43.2555 40.3667C43.2315 40.4389 43.1833 40.463 43.1352 40.463ZM42.437 39.2593C42.7981 39.4037 42.9907 39.5723 43.1352 39.9574C43.2796 39.5963 43.4481 39.4037 43.8333 39.2593C43.4722 39.1149 43.2796 38.9463 43.1352 38.5611C42.9907 38.9463 42.8222 39.1149 42.437 39.2593Z" fill="#002140"/>
+<path d="M31.7481 38.3927C31.7 38.3927 31.6518 38.3445 31.6277 38.2964C31.4352 37.5982 31.3148 37.4778 30.6166 37.2853C30.5685 37.2612 30.5203 37.213 30.5203 37.1649C30.5203 37.1167 30.5685 37.0686 30.6166 37.0445C31.3148 36.8519 31.4352 36.7316 31.6277 36.0334C31.6518 35.9371 31.8444 35.9371 31.8685 36.0334C32.0611 36.7316 32.1815 36.8519 32.8796 37.0445C32.9277 37.0686 32.9759 37.1167 32.9759 37.1649C32.9759 37.213 32.9277 37.2612 32.8796 37.2853C32.1815 37.4778 32.0611 37.5982 31.8685 38.2964C31.8444 38.3686 31.7963 38.3927 31.7481 38.3927ZM31.074 37.189C31.4352 37.3334 31.6277 37.5019 31.7722 37.8871C31.9166 37.526 32.0852 37.3334 32.4703 37.189C32.1092 37.0445 31.9166 36.876 31.7722 36.4908C31.6037 36.8519 31.4352 37.0445 31.074 37.189Z" fill="#002140"/>
+<path d="M35.8407 32.7352L41.2092 34.5648C41.2092 34.5648 41.3778 33.5056 39.9333 32.8556L40.1259 31.5556C40.1259 31.5556 40.0055 30.713 39.3796 30.5445C38.7778 30.376 38.1518 30.8093 38.0555 31.0019C37.9592 31.1945 37.574 32.1334 37.574 32.1334C37.574 32.1334 36.1778 32.1334 35.8407 32.7352Z" fill="#008C59"/>
+<path d="M41.2092 34.6852H41.1852C41.1129 34.6611 41.0889 34.5889 41.1129 34.5407C41.3055 33.8907 40.2944 32.9759 38.874 32.5426C37.55 32.1333 36.25 32.2537 35.937 32.8074C35.9129 32.8555 35.8407 32.8796 35.7685 32.8555C35.7203 32.8315 35.6963 32.7592 35.7203 32.687C36.0814 32.0129 37.4777 31.8444 38.9222 32.3018C40.5111 32.8074 41.5463 33.8185 41.3055 34.5889C41.3055 34.637 41.2574 34.6852 41.2092 34.6852Z" fill="#002140"/>
+<path d="M39.9333 32.9759C39.9333 32.9759 39.9092 32.9759 39.9333 32.9759C39.8611 32.9759 39.8129 32.9037 39.8129 32.8314L39.9814 31.7C40.0296 31.1944 39.7166 30.737 39.2352 30.6166C38.7777 30.4963 38.2722 30.7611 38.1037 31.2185L37.7666 32.1092C37.7426 32.1814 37.6703 32.2055 37.6222 32.1814C37.55 32.1574 37.5259 32.0852 37.55 32.037L37.887 31.1463C38.1037 30.5685 38.7055 30.2314 39.3074 30.3759C39.9092 30.5203 40.2944 31.0981 40.2222 31.724L40.0537 32.8555C40.0296 32.9277 39.9814 32.9759 39.9333 32.9759Z" fill="#002140"/>
+<path d="M34.9259 42.1C34.9259 42.1 35.0463 42.413 35.3352 42.413C35.624 42.413 36.0333 42.437 36.0333 42.437L36.2981 42.6537C36.2981 42.6537 36.5148 43.3759 37.0685 43.3037C37.6463 43.2315 37.5259 42.7019 37.5981 42.7981C38.1037 42.8463 38.1037 42.6778 38.1759 42.2926C38.1759 42.2926 38.6333 42.2204 38.6814 41.8593C38.6814 41.8593 39.4518 42.1241 40.487 41.6185C41.4981 41.113 41.3296 40.3426 41.3055 40.0296C41.2814 39.7167 40.8963 38.9463 40.7518 38.85C40.6074 38.7537 40.2463 38.4407 40.2463 38.4407L35.0944 36.9241L36.6833 40.5352C36.6833 40.487 34.3722 40.6556 34.9259 42.1Z" fill="#03D47C"/>
+<path d="M32.1814 34.7333C32.1814 34.7333 32.1333 35.9129 34.0833 36.5388C36.0574 37.1648 39.9814 38.2962 39.9814 38.2962C39.9814 38.2962 42.8463 38.9222 43.2796 37.4055C43.6889 35.8888 42.9426 35.4796 42.3889 35.1425C42.3889 35.1425 39.8611 33.7462 37.237 33.1444C34.5888 32.5185 33.2407 32.4462 32.5185 33.6259C32.374 34.0592 32.1814 34.5648 32.1814 34.7333Z" fill="#008C59"/>
+<path d="M36.0814 36.25C36.7074 36.25 37.2129 35.7445 37.2129 35.1185C37.2129 34.4926 36.7074 33.9871 36.0814 33.9871C35.4555 33.9871 34.95 34.4926 34.95 35.1185C34.95 35.7445 35.4555 36.25 36.0814 36.25Z" fill="#8EECC4"/>
+<path d="M38.3685 37.0204C38.9944 37.0204 39.5 36.5149 39.5 35.8889C39.5 35.263 38.9944 34.7574 38.3685 34.7574C37.7426 34.7574 37.237 35.263 37.237 35.8889C37.237 36.5149 37.7426 37.0204 38.3685 37.0204Z" fill="#8EECC4"/>
+<path d="M35.4314 37.8389L34.9981 36.9L31.6277 40.6797C31.6277 40.6797 31.5314 41.3297 31.6759 41.5945C31.7963 41.8593 32.3981 42.1 32.3981 42.1L34.9259 42.076C34.9259 42.076 34.6851 41.2815 35.1185 40.9926L32.9277 40.9685L32.7592 40.8963L35.4314 37.8389Z" fill="#002140"/>
+<path d="M34.5648 32.663C34.5648 32.663 33.5055 32.7833 33.1444 33.0241C33.1444 33.0241 33.1685 34.3241 34.2037 34.0111C35.2629 33.6981 34.7092 32.687 34.5648 32.663Z" fill="#002140"/>
+<path d="M33.4574 34.5408C33.4574 34.5408 32.6148 34.5408 32.4463 35.3593C32.4463 35.3593 32.9518 36.0334 33.2889 36.1778C33.2889 36.1778 33.987 36.1537 34.0833 35.5519C34.1796 34.95 33.7463 34.5408 33.4574 34.5408Z" fill="#002140"/>
+<path d="M38.537 33.5537C38.537 33.5537 37.2129 33.0723 36.9963 33.0723C36.7796 33.0963 36.8037 34.0593 37.55 34.2278C38.2963 34.4204 38.537 33.5537 38.537 33.5537Z" fill="#002140"/>
+<path d="M41.8592 34.9259L40.6555 34.3481C40.6555 34.3481 40.2703 34.6852 40.2463 34.9018C40.2222 35.1185 40.3185 35.8648 40.8722 35.913C41.4259 35.9852 41.8833 35.5278 41.8592 34.9259Z" fill="#002140"/>
+<path d="M43.0148 35.7686C43.0148 35.7686 42.5333 35.8889 42.5814 36.4426C42.6296 36.9963 43.3518 37.0926 43.3518 37.0926C43.3518 37.0926 43.7129 36.0574 43.0148 35.7686Z" fill="#002140"/>
+<path d="M40.7759 38.4166L41.6185 38.4888C41.6185 38.4888 42.1722 38.0555 42.0518 37.6462C41.9314 37.237 41.6185 36.8999 41.0889 36.9481C40.5592 36.9962 40.4629 37.5018 40.4389 37.6221C40.3426 37.9833 40.6796 38.3925 40.7759 38.4166Z" fill="#002140"/>
+<path d="M41.3296 38.6333C40.6555 38.6333 39.9574 38.4407 39.4759 38.2963C37.9592 37.8629 36.4185 37.3815 34.9259 36.924L34.4685 36.7796C33.2407 36.3944 32.5185 35.9129 32.2055 35.287C32.0129 34.8777 32.0129 34.4203 32.2296 33.9389C33.1685 31.7 36.2981 32.687 38.1759 33.2889C38.3926 33.3611 38.6092 33.4333 38.8018 33.4815C39.6926 33.7463 40.6314 34.1315 41.6185 34.637L41.7148 34.6852C42.4611 35.0703 43.5685 35.624 43.5685 36.6592C43.5685 36.924 43.4963 37.2129 43.3277 37.5018C42.8703 38.3926 42.1 38.6333 41.3296 38.6333ZM34.6611 32.8074C33.6981 32.8074 32.8555 33.1203 32.4703 34.0592C32.3018 34.4926 32.2777 34.8777 32.4463 35.2148C32.7111 35.7685 33.4092 36.2259 34.5648 36.587L35.0222 36.7315C36.5148 37.1889 38.0314 37.6703 39.5481 38.1037C41.0166 38.5129 42.4611 38.7055 43.1351 37.4296C43.2796 37.1648 43.3518 36.924 43.3518 36.6833C43.3518 35.8166 42.3648 35.3111 41.6185 34.9259L41.5222 34.8777C40.5592 34.3722 39.6203 34.0111 38.7537 33.7463C38.5611 33.6981 38.3444 33.6259 38.1037 33.5537C37.1166 33.2166 35.7926 32.8074 34.6611 32.8074Z" fill="#002140"/>
+<path d="M36.0333 36.4426C35.3111 36.4426 34.7333 35.8648 34.7333 35.1667C34.7333 34.4685 35.3111 33.8907 36.0333 33.8907C36.7555 33.8907 37.3333 34.4685 37.3333 35.1667C37.3333 35.8648 36.7555 36.4426 36.0333 36.4426ZM36.0333 34.1315C35.4555 34.1315 34.974 34.5889 34.974 35.1667C34.974 35.7445 35.4555 36.2019 36.0333 36.2019C36.6111 36.2019 37.0926 35.7445 37.0926 35.1667C37.0926 34.5889 36.6111 34.1315 36.0333 34.1315Z" fill="#002140"/>
+<path d="M36.1777 35.2149L36.9 35.263C36.924 34.8537 36.6833 34.4686 36.2981 34.4204C35.9129 34.3482 35.5277 34.6852 35.4555 35.1426C35.3833 35.6 35.6481 36.0334 36.0333 36.1056C36.274 36.1537 36.4907 36.0574 36.6592 35.8649L36.1777 35.2149Z" fill="#002140"/>
+<path d="M38.3685 35.8648L39.0907 35.9129C39.1148 35.5036 38.874 35.1185 38.4888 35.0703C38.1037 34.9981 37.7185 35.3351 37.6463 35.7925C37.574 36.2499 37.8389 36.6833 38.224 36.7555C38.4648 36.8036 38.6814 36.7074 38.85 36.5148L38.3685 35.8648Z" fill="#002140"/>
+<path d="M38.3444 37.1889C37.6222 37.1889 37.0444 36.6112 37.0444 35.913C37.0444 35.2149 37.6222 34.6371 38.3444 34.6371C39.0666 34.6371 39.6444 35.2149 39.6444 35.913C39.6444 36.6112 39.0666 37.1889 38.3444 37.1889ZM38.3444 34.8538C37.7666 34.8538 37.2852 35.3112 37.2852 35.8889C37.2852 36.4667 37.7666 36.9241 38.3444 36.9241C38.9222 36.9241 39.4037 36.4667 39.4037 35.8889C39.4037 35.3112 38.9222 34.8538 38.3444 34.8538Z" fill="#002140"/>
+<path d="M36.6592 40.5833C36.6111 40.5833 36.5629 40.5593 36.5389 40.5111L34.9018 36.9C34.8778 36.8278 34.9018 36.7796 34.95 36.7315C35.0222 36.7074 35.0703 36.7315 35.1185 36.7796L36.7555 40.3907C36.7796 40.463 36.7555 40.5111 36.7074 40.5593C36.6833 40.5833 36.6833 40.5833 36.6592 40.5833Z" fill="#002140"/>
+<path d="M39.2833 42.0519C38.8741 42.0519 38.6815 41.9556 38.6815 41.9556C38.6092 41.9315 38.5852 41.8593 38.6333 41.7871C38.6574 41.7389 38.7296 41.6908 38.8018 41.7389C38.8018 41.7389 38.9944 41.8112 39.4037 41.8112C39.7889 41.7871 41.2574 41.4982 41.2574 40.2945C41.2574 39.1149 40.1981 38.4889 40.1981 38.4889C40.15 38.4649 40.1259 38.3926 40.15 38.3204C40.1741 38.2723 40.2463 38.2482 40.3185 38.2723C40.3666 38.2963 41.4981 38.9463 41.4981 40.2704C41.4981 41.6667 39.837 42.0037 39.4037 42.0278C39.3555 42.0519 39.3315 42.0519 39.2833 42.0519Z" fill="#002140"/>
+<path d="M37.6944 42.9185C37.6703 42.9185 37.6463 42.9185 37.6463 42.9185C37.574 42.9185 37.5259 42.8463 37.5259 42.7981C37.5259 42.7259 37.5981 42.6777 37.6463 42.6777C37.6463 42.6777 37.9111 42.7018 38.0315 42.5333C38.0796 42.4851 38.1037 42.3648 38.0555 42.2203C38.0315 42.0759 37.887 41.7389 37.3333 41.474C37.2852 41.45 37.2611 41.3777 37.2852 41.3055C37.3092 41.2574 37.3815 41.2333 37.4537 41.2574C38.0796 41.5703 38.2481 41.9555 38.2963 42.1722C38.3444 42.3648 38.3203 42.5574 38.224 42.6777C38.0796 42.8944 37.8148 42.9185 37.6944 42.9185Z" fill="#002140"/>
+<path d="M37.0926 43.4722C36.7074 43.4722 36.4907 43.087 36.3463 42.8222C36.3222 42.774 36.2981 42.7259 36.274 42.6777C36.1778 42.5333 36.1055 42.5333 35.5759 42.5574H35.4796C34.9259 42.5814 34.7333 42.0037 34.7333 41.6907C34.7333 41.4259 34.8296 41.1851 35.0222 40.9925C35.3833 40.6314 36.0092 40.4388 36.7555 40.4388C37.2611 40.4388 37.9592 40.7759 38.0074 40.8C38.6333 41.1129 38.8018 41.4981 38.85 41.7148C38.8981 41.9074 38.874 42.1 38.7778 42.2203C38.6574 42.3888 38.4407 42.4611 38.3203 42.4611C38.2481 42.4611 38.2 42.4129 38.2 42.3648C38.2 42.2925 38.2481 42.2444 38.2963 42.2444C38.3926 42.2444 38.5129 42.1962 38.5852 42.1C38.6333 42.0518 38.6574 41.9314 38.6092 41.787C38.5852 41.6425 38.4407 41.3055 37.887 41.0407C37.887 41.0407 37.1889 40.7037 36.7555 40.7037C36.0574 40.7037 35.5037 40.8722 35.1907 41.1851C35.0463 41.3537 34.95 41.5222 34.974 41.7148C34.974 41.7388 34.9981 42.3648 35.4796 42.3407H35.5759C36.1055 42.3166 36.3222 42.3166 36.4907 42.5814C36.5148 42.6296 36.5389 42.6777 36.587 42.75C36.7074 42.9666 36.8759 43.2796 37.1166 43.2796C37.4055 43.2796 37.5259 43.1592 37.5259 42.8944C37.5259 42.6777 37.1166 42.1963 36.6592 41.9555C36.6111 41.9314 36.587 41.8592 36.6111 41.787C36.6352 41.7388 36.7074 41.7148 36.7796 41.7388C37.237 41.9796 37.7666 42.5333 37.7666 42.8944C37.7426 43.2555 37.5259 43.4722 37.0926 43.4722Z" fill="#002140"/>
+<path d="M35.0703 41.137H32.9518C32.8555 41.137 32.7833 41.0889 32.7592 41.0166C32.7111 40.9444 32.7352 40.8481 32.7833 40.7759L35.3352 37.8148C35.3833 37.7666 35.4555 37.7666 35.5037 37.7907C35.5518 37.8389 35.5518 37.9111 35.5277 37.9592L33 40.8963H35.0703C35.1426 40.8963 35.1907 40.9444 35.1907 41.0166C35.1907 41.0889 35.1426 41.137 35.0703 41.137Z" fill="#002140"/>
+<path d="M34.9018 42.2685H32.5185C32.0852 42.2685 31.724 42.0277 31.5314 41.6426C31.3629 41.2574 31.4352 40.8 31.7 40.487L34.95 36.8277C34.9981 36.7796 35.0703 36.7796 35.1185 36.8277C35.1666 36.8759 35.1666 36.9481 35.1185 36.9963L31.8926 40.6314C31.6759 40.8722 31.6277 41.2333 31.7481 41.5222C31.8926 41.8351 32.1814 42.0037 32.5185 42.0037H34.9259C34.9981 42.0037 35.0463 42.0518 35.0463 42.124C35.0463 42.1963 34.974 42.2685 34.9018 42.2685Z" fill="#002140"/>
+<path d="M41.6426 38.5852C41.5944 38.5852 41.5703 38.5611 41.5463 38.5371C41.5222 38.4889 41.5222 38.4167 41.5944 38.3685C41.8111 38.2482 41.9314 38.0315 41.9314 37.7908C41.9314 37.4056 41.6185 37.1167 41.2574 37.1167C40.8722 37.1167 40.5833 37.4297 40.5833 37.7908C40.5833 38.0074 40.6796 38.2 40.8481 38.3445C40.8963 38.3926 40.9203 38.4648 40.8722 38.513C40.824 38.5611 40.7518 38.5852 40.7037 38.5371C40.4629 38.3685 40.3426 38.1037 40.3426 37.8148C40.3426 37.3093 40.7518 36.9 41.2574 36.9C41.7629 36.9 42.1722 37.3093 42.1722 37.8148C42.1722 38.1519 42.0037 38.4408 41.7389 38.6093C41.6907 38.5852 41.6666 38.5852 41.6426 38.5852Z" fill="#002140"/>
+<path d="M43.2555 37.213C42.7981 37.213 42.437 36.8519 42.437 36.3944C42.437 36.0333 42.6537 35.7204 43.0148 35.6241C43.087 35.6 43.1352 35.6482 43.1592 35.6963C43.1833 35.7685 43.1352 35.8167 43.087 35.8407C42.8463 35.913 42.6778 36.1296 42.6778 36.3944C42.6778 36.7074 42.9426 36.9722 43.2555 36.9722C43.2796 36.9722 43.3037 36.9722 43.3278 36.9722C43.4 36.9722 43.4481 36.9963 43.4722 37.0685C43.4963 37.1407 43.4481 37.1889 43.3759 37.213C43.3278 37.213 43.3037 37.213 43.2555 37.213Z" fill="#002140"/>
+<path d="M41.0166 36.0574C40.487 36.0574 40.0777 35.6241 40.0777 35.1185C40.0777 34.7574 40.2944 34.4204 40.6074 34.2759C40.6555 34.2518 40.7277 34.2759 40.7759 34.3241C40.8 34.3722 40.7759 34.4444 40.7277 34.4926C40.487 34.613 40.3426 34.8537 40.3426 35.1185C40.3426 35.5037 40.6555 35.8167 41.0407 35.8167C41.4259 35.8167 41.7389 35.5037 41.7389 35.1185C41.7389 35.0704 41.7389 35.0222 41.7148 34.9741C41.6907 34.9019 41.7389 34.8537 41.8111 34.8296C41.8833 34.8056 41.9314 34.8537 41.9555 34.9259C41.9796 34.9981 41.9796 35.0463 41.9796 35.1185C41.9555 35.6241 41.5463 36.0574 41.0166 36.0574Z" fill="#002140"/>
+<path d="M33.3611 36.2981C33.2888 36.2981 33.2407 36.2499 33.2407 36.1777C33.2407 36.1055 33.2888 36.0573 33.3611 36.0573C33.7222 36.0333 33.987 35.7203 33.987 35.3592C33.987 34.974 33.674 34.661 33.2888 34.661C32.9037 34.661 32.5907 34.974 32.5907 35.3592C32.5907 35.3833 32.5907 35.4314 32.5907 35.4555C32.5907 35.5277 32.5426 35.5758 32.4944 35.5999C32.4222 35.5999 32.374 35.5518 32.35 35.5036C32.35 35.4555 32.35 35.4073 32.35 35.3592C32.35 34.8295 32.7833 34.4203 33.2888 34.4203C33.7944 34.4203 34.2277 34.8536 34.2277 35.3592C34.2277 35.8647 33.8666 36.2499 33.3611 36.2981Z" fill="#002140"/>
+<path d="M33.9629 34.1555C33.4333 34.1555 33 33.7222 33 33.1925C33 33.1444 33 33.0722 33.024 33.024C33.024 32.9518 33.0963 32.9037 33.1685 32.9277C33.2407 32.9277 33.2889 33 33.2648 33.0722C33.2648 33.1203 33.2648 33.1444 33.2648 33.1925C33.2648 33.5777 33.5777 33.9148 33.987 33.9148C34.3963 33.9148 34.7092 33.6018 34.7092 33.1925C34.7092 33.0481 34.6611 32.8796 34.5648 32.7592C34.5166 32.7111 34.5407 32.6388 34.5889 32.5907C34.637 32.5425 34.7092 32.5666 34.7574 32.6148C34.8777 32.7833 34.95 32.9759 34.95 33.1925C34.9259 33.7222 34.4926 34.1555 33.9629 34.1555Z" fill="#002140"/>
+<path d="M37.7426 34.3722C37.2129 34.3722 36.7796 33.9389 36.7796 33.4093C36.7796 33.2889 36.8037 33.1685 36.8518 33.0482C36.8759 32.9759 36.9481 32.9519 37.0203 32.9759C37.0926 33 37.1166 33.0722 37.0926 33.1445C37.0685 33.2408 37.0444 33.313 37.0444 33.4093C37.0444 33.7945 37.3574 34.1315 37.7666 34.1315C38.1037 34.1315 38.3926 33.8908 38.4648 33.5537C38.4889 33.4815 38.537 33.4334 38.6092 33.4574C38.6815 33.4815 38.7055 33.5297 38.7055 33.6019C38.5852 34.0593 38.2 34.3722 37.7426 34.3722Z" fill="#002140"/>
+<path d="M37.9592 38.3204L37.3815 39.0186C37.3815 39.0186 37.2611 39.2352 37.3815 39.3315C37.5018 39.4278 37.6703 39.4278 37.7666 39.3315C37.8629 39.2352 38.2722 38.6334 38.2722 38.6334L37.9592 38.3204Z" fill="#8EECC4"/>
+<path d="M38.5852 38.7056L38.0074 39.4037C38.0074 39.4037 37.887 39.6204 38.0074 39.7167C38.1278 39.813 38.2963 39.813 38.3926 39.7167C38.4889 39.6204 38.8981 39.0185 38.8981 39.0185L38.5852 38.7056Z" fill="#8EECC4"/>
+<path d="M38.4648 39.6926C38.4648 39.6926 38.4166 39.9093 38.1518 39.813C37.887 39.6926 37.9111 39.3796 37.9111 39.3796C37.9111 39.3796 37.4296 39.6444 37.3815 39.3315C37.3333 39.0185 37.237 39.0667 37.4296 38.85C37.6463 38.6333 37.887 38.2481 37.887 38.2481C37.887 38.2481 37.4055 37.887 37.1648 37.9593C36.9241 38.0315 36.5629 38.3685 36.5629 38.4648C36.5629 38.5611 36.5148 39.7167 37.9833 40.15C39.4518 40.5833 39.6444 40.1019 39.7407 39.8611C39.837 39.6444 40.0296 39.4037 39.6685 39.2352C39.3074 39.0667 38.9944 38.9704 38.9944 38.9704L38.4648 39.6926Z" fill="#002140"/>
+<path d="M37.3092 39.0666L37.9111 38.2722C37.9111 38.2722 37.1648 37.6704 36.7074 38.2481C36.25 38.8259 36.9963 39.6204 36.9963 39.6204C36.9963 39.6204 38.0074 40.3666 38.7777 40.3907C39.5481 40.4148 39.7889 39.8129 39.7889 39.8129L39.7407 39.3796L38.9944 38.9463L38.3203 39.837C38.3203 39.837 38.1277 39.8129 38.0074 39.7889C37.887 39.7407 37.9352 39.3315 37.9352 39.3315C37.9352 39.3315 37.5018 39.5 37.4055 39.4037C37.3092 39.3315 37.3092 39.0666 37.3092 39.0666Z" fill="#002140"/>
+<path d="M38.8981 40.5111C38.4166 40.5111 37.887 40.2945 37.6222 40.1741C36.6111 39.6926 36.4666 39.0185 36.4426 38.9222C36.4426 38.9222 36.4426 38.9222 36.4426 38.8982C36.3944 38.4648 36.5389 38.1278 36.8518 37.9593C37.3092 37.7426 37.8148 37.9834 38.1277 38.2963C38.2722 38.4408 38.4889 38.5852 38.7537 38.7056C38.85 38.7537 38.9222 38.7778 39.0185 38.8259C39.2352 38.9222 39.4759 39.0185 39.6685 39.163C39.8129 39.2593 39.8852 39.4037 39.9092 39.5963C39.9092 39.8371 39.7889 40.1259 39.5963 40.2945C39.4037 40.463 39.1629 40.5111 38.8981 40.5111ZM36.6833 38.85C36.6833 38.8741 36.7796 39.4759 37.7185 39.9334C38.0074 40.0778 38.9703 40.4871 39.4518 40.0778C39.5963 39.9574 39.6926 39.7408 39.6926 39.5722C39.6926 39.4759 39.6444 39.3796 39.5722 39.3315C39.3796 39.2111 39.187 39.1148 38.9703 39.0185C38.874 38.9704 38.7777 38.9463 38.7055 38.8982C38.4166 38.7537 38.1759 38.6093 38.0074 38.4408C37.7426 38.1759 37.3333 37.9834 36.9963 38.1519C36.6592 38.3204 36.6592 38.7056 36.6833 38.85Z" fill="#002140"/>
+<path d="M37.55 39.5963C37.4296 39.5963 37.3574 39.5482 37.3333 39.5241C37.2852 39.5 37.1889 39.4038 37.1648 39.2593C37.1407 39.1389 37.1889 39.0186 37.3092 38.8741C37.5259 38.5852 37.7666 38.2482 37.7666 38.2482C37.8148 38.2 37.887 38.176 37.9352 38.2241C37.9833 38.2723 38.0074 38.3445 37.9592 38.3926C37.9592 38.4167 37.7185 38.7538 37.4777 39.0426C37.4055 39.1149 37.3815 39.1871 37.3815 39.2593C37.3815 39.3075 37.4296 39.3315 37.4537 39.3556C37.4537 39.3556 37.5018 39.3797 37.55 39.3797C37.6222 39.3556 37.7185 39.3075 37.7907 39.1871L38.2 38.6334C38.2481 38.5852 38.3203 38.5612 38.3685 38.6093C38.4166 38.6575 38.4407 38.7297 38.3926 38.7778L37.9833 39.3315C37.8629 39.5 37.7185 39.5963 37.574 39.6204C37.5981 39.5723 37.574 39.5963 37.55 39.5963Z" fill="#002140"/>
+<path d="M38.1759 39.9814C38.0555 39.9814 37.9833 39.9333 37.9592 39.9092C37.9111 39.8851 37.8148 39.7888 37.7907 39.6444C37.7666 39.524 37.8148 39.4036 37.9352 39.2592C38.0555 39.1148 38.2 38.8981 38.3685 38.6814C38.4166 38.6333 38.4889 38.6092 38.537 38.6573C38.5852 38.7055 38.6092 38.7777 38.5611 38.8259C38.3926 39.0666 38.2481 39.2592 38.1278 39.4277C38.0555 39.4999 38.0315 39.5722 38.0315 39.6444C38.0315 39.6925 38.0796 39.7166 38.1037 39.7407C38.1037 39.7407 38.1518 39.7648 38.2 39.7648C38.2722 39.7407 38.3685 39.6925 38.4407 39.5722L38.85 39.0185C38.8981 38.9703 38.9703 38.9462 39.0185 38.9944C39.0666 39.0425 39.0907 39.1148 39.0426 39.1629L38.6333 39.7166C38.5129 39.8851 38.3685 39.9814 38.2241 40.0055C38.2241 39.9814 38.2 39.9814 38.1759 39.9814Z" fill="#002140"/>
+</g>
+<path d="M40.3666 65.4425C40.2222 64.937 39.7889 64.6481 39.3555 64.6481H35.3111C34.8055 64.6481 34.3722 64.937 34.3 65.4425L33 68.9814V69.7036V71.8703C33 72.3036 33.2889 72.5925 33.7222 72.5925H40.9444C41.3777 72.5925 41.6666 72.3036 41.6666 71.8703V68.9814L40.3666 65.4425ZM38.7777 69.6314C38.7777 69.9925 38.4889 70.2814 38.1277 70.2814H36.5389C36.1777 70.2814 35.8889 69.9925 35.8889 69.6314C35.8889 69.2703 35.6 68.9814 35.2389 68.9814H33.7944L34.95 65.6592C35.0222 65.4425 35.1666 65.3703 35.3111 65.3703H39.3555C39.5 65.3703 39.6444 65.4425 39.7166 65.6592L40.8 68.9814H39.4277C39.0666 68.9814 38.7777 69.2703 38.7777 69.6314Z" fill="#8B9C8F"/>
+<path d="M31.9506 82.6481H31.4369V78.9407H31.9506V82.6481ZM33.2733 82.6481H32.7808V80.0476H33.2521V80.3866C33.4534 80.1058 33.6864 79.9893 34.0466 79.9893C34.6504 79.9893 34.9522 80.3283 34.9522 81.0592V82.6481H34.4597V81.1016C34.4597 80.6355 34.3061 80.4395 33.9354 80.4395C33.464 80.4395 33.2733 80.7573 33.2733 81.2869V82.6481ZM36.9951 82.7063C36.6455 82.7063 36.4178 82.5898 36.1848 82.3091V82.6481H35.7134V78.9407H36.2059V80.3813C36.4337 80.1058 36.6614 79.9893 37.0004 79.9893C37.6995 79.9893 38.155 80.5243 38.155 81.3452C38.155 82.1714 37.6995 82.7063 36.9951 82.7063ZM36.9315 82.2614C37.3923 82.2614 37.6677 81.9437 37.6677 81.3452C37.6677 80.7467 37.3923 80.4342 36.9315 80.4342C36.4655 80.4342 36.1953 80.7467 36.1953 81.3452C36.1953 81.9437 36.4655 82.2614 36.9315 82.2614ZM39.8136 82.7063C39.0721 82.7063 38.5796 82.1714 38.5796 81.3452C38.5796 80.5243 39.0721 79.9893 39.8136 79.9893C40.5551 79.9893 41.0424 80.5243 41.0424 81.3452C41.0424 82.1714 40.5551 82.7063 39.8136 82.7063ZM39.8136 82.2614C40.2744 82.2614 40.5445 81.9437 40.5445 81.3452C40.5445 80.7467 40.2744 80.4342 39.8136 80.4342C39.3476 80.4342 39.0774 80.7467 39.0774 81.3452C39.0774 81.9437 39.3476 82.2614 39.8136 82.2614ZM41.8167 82.6481H41.2606L42.1451 81.3134L41.3083 80.0476H41.875L42.4364 80.9268L42.9925 80.0476H43.5486L42.7065 81.3028L43.5963 82.6481H43.0296L42.4152 81.6894L41.8167 82.6481Z" fill="#AFBBB0"/>
+<path d="M40.2222 102.693L39.5 102.115L38.7778 102.693L38.0555 102.115L37.3333 102.693L36.6111 102.115L35.8889 102.693L35.1666 102.115L34.4444 102.693L33.7222 102.115V112.948L34.4444 112.371L35.1666 112.948L35.8889 112.371L36.6111 112.948L37.3333 112.371L38.0555 112.948L38.7778 112.371L39.5 112.948L40.2222 112.371L40.9444 112.948V102.115L40.2222 102.693ZM39.1389 110.06H35.5278C35.3111 110.06 35.1666 109.915 35.1666 109.698C35.1666 109.482 35.3111 109.337 35.5278 109.337H39.1389C39.3555 109.337 39.5 109.482 39.5 109.698C39.5 109.915 39.3555 110.06 39.1389 110.06ZM39.1389 107.893H35.5278C35.3111 107.893 35.1666 107.748 35.1666 107.532C35.1666 107.315 35.3111 107.171 35.5278 107.171H39.1389C39.3555 107.171 39.5 107.315 39.5 107.532C39.5 107.748 39.3555 107.893 39.1389 107.893ZM39.1389 105.726H35.5278C35.3111 105.726 35.1666 105.582 35.1666 105.365C35.1666 105.148 35.3111 105.004 35.5278 105.004H39.1389C39.3555 105.004 39.5 105.148 39.5 105.365C39.5 105.582 39.3555 105.726 39.1389 105.726Z" fill="#8B9C8F"/>
+<path d="M29.1623 121.167H26.5724V117.459H29.0988V117.936H27.0862V119.027H28.8393V119.504H27.0862V120.69H29.1623V121.167ZM30.0009 121.167H29.4448L30.3293 119.832L29.4924 118.566H30.0591L30.6206 119.445L31.1767 118.566H31.7328L30.8907 119.821L31.7804 121.167H31.2137L30.5994 120.208L30.0009 121.167ZM32.738 122.316H32.2454V118.566H32.7168V118.905C32.9393 118.624 33.1882 118.508 33.5324 118.508C34.2316 118.508 34.687 119.043 34.687 119.864C34.687 120.69 34.221 121.225 33.5324 121.225C33.1882 121.225 32.9393 121.108 32.738 120.844V122.316ZM33.4636 120.78C33.9244 120.78 34.1998 120.462 34.1998 119.864C34.1998 119.265 33.9244 118.953 33.4636 118.953C32.9975 118.953 32.7274 119.265 32.7274 119.864C32.7274 120.462 32.9975 120.78 33.4636 120.78ZM37.4844 119.784V119.959H35.6148C35.6413 120.52 35.9379 120.791 36.351 120.791C36.6741 120.791 36.8541 120.674 36.9654 120.409H37.4738C37.2831 120.992 36.8382 121.225 36.351 121.225C35.6201 121.225 35.1116 120.69 35.1116 119.864C35.1116 118.963 35.6572 118.508 36.3351 118.508C37.0395 118.508 37.4844 119.043 37.4844 119.784ZM35.6307 119.588H36.9706C36.9389 119.143 36.7111 118.932 36.3351 118.932C35.9591 118.932 35.6995 119.138 35.6307 119.588ZM38.5774 121.167H38.0848V118.566H38.5562V118.905C38.7574 118.624 38.9905 118.508 39.3506 118.508C39.9544 118.508 40.2563 118.847 40.2563 119.578V121.167H39.7637V119.62C39.7637 119.154 39.6101 118.958 39.2394 118.958C38.768 118.958 38.5774 119.276 38.5774 119.805V121.167ZM41.9125 121.225C41.2717 121.225 40.885 120.934 40.8109 120.388H41.314C41.3723 120.69 41.5788 120.812 41.9231 120.812C42.2938 120.812 42.4951 120.716 42.4951 120.468C42.4951 120.272 42.3627 120.171 42.0025 120.086L41.7748 120.033C41.1445 119.885 40.8956 119.657 40.8956 119.26C40.8956 118.778 41.2664 118.508 41.8807 118.508C42.511 118.508 42.8923 118.789 42.9453 119.308H42.4421C42.3998 119.027 42.2091 118.921 41.8913 118.921C41.5682 118.921 41.3882 119.006 41.3882 119.233C41.3882 119.419 41.51 119.519 41.8542 119.599L42.0873 119.652C42.7175 119.795 42.9877 120.023 42.9877 120.436C42.9877 120.939 42.5851 121.225 41.9125 121.225ZM45.765 119.784V119.959H43.8954C43.9219 120.52 44.2185 120.791 44.6316 120.791C44.9547 120.791 45.1348 120.674 45.246 120.409H45.7544C45.5638 120.992 45.1189 121.225 44.6316 121.225C43.9007 121.225 43.3923 120.69 43.3923 119.864C43.3923 118.963 43.9378 118.508 44.6157 118.508C45.3201 118.508 45.765 119.043 45.765 119.784ZM43.9113 119.588H45.2513C45.2195 119.143 44.9918 118.932 44.6157 118.932C44.2397 118.932 43.9802 119.138 43.9113 119.588ZM47.2605 121.225C46.6197 121.225 46.233 120.934 46.1589 120.388H46.662C46.7203 120.69 46.9269 120.812 47.2711 120.812C47.6419 120.812 47.8431 120.716 47.8431 120.468C47.8431 120.272 47.7107 120.171 47.3506 120.086L47.1228 120.033C46.4926 119.885 46.2436 119.657 46.2436 119.26C46.2436 118.778 46.6144 118.508 47.2287 118.508C47.859 118.508 48.2403 118.789 48.2933 119.308H47.7902C47.7478 119.027 47.5571 118.921 47.2393 118.921C46.9163 118.921 46.7362 119.006 46.7362 119.233C46.7362 119.419 46.858 119.519 47.2023 119.599L47.4353 119.652C48.0656 119.795 48.3357 120.023 48.3357 120.436C48.3357 120.939 47.9332 121.225 47.2605 121.225Z" fill="#AFBBB0"/>
+<g clip-path="url(#clip4_1626_5832)">
+<path d="M39.5 142.407V140.963L40.9444 142.407H39.5Z" fill="#8B9C8F"/>
+<path d="M40.9444 143.13H39.5C39.0666 143.13 38.7778 142.841 38.7778 142.407V140.963H34.0833C33.8666 140.963 33.7222 141.107 33.7222 141.324V150.713C33.7222 150.93 33.8666 151.074 34.0833 151.074H40.5833C40.8 151.074 40.9444 150.93 40.9444 150.713V143.13Z" fill="#8B9C8F"/>
+</g>
+<path d="M31.085 158.525L31.5299 159.685H30.9738L30.5765 158.647C30.4547 158.324 30.3382 158.276 30.0204 158.276H29.1783V159.685H28.6646V155.978H30.1158C30.9314 155.978 31.4081 156.401 31.4081 157.111C31.4081 157.609 31.1433 157.927 30.7407 158.054C30.9102 158.139 30.995 158.287 31.085 158.525ZM29.1783 156.454V157.8H30.1105C30.6242 157.8 30.8943 157.572 30.8943 157.122C30.8943 156.682 30.6242 156.454 30.1105 156.454H29.1783ZM34.1406 158.303V158.478H32.271C32.2975 159.039 32.5941 159.309 33.0072 159.309C33.3302 159.309 33.5103 159.193 33.6215 158.928H34.13C33.9393 159.51 33.4944 159.743 33.0072 159.743C32.2763 159.743 31.7678 159.209 31.7678 158.382C31.7678 157.482 32.3134 157.026 32.9913 157.026C33.6957 157.026 34.1406 157.561 34.1406 158.303ZM32.2869 158.107H33.6268C33.5951 157.662 33.3673 157.45 32.9913 157.45C32.6152 157.45 32.3557 157.657 32.2869 158.107ZM35.2336 160.834H34.741V157.085H35.2124V157.424C35.4348 157.143 35.6837 157.026 36.028 157.026C36.7271 157.026 37.1826 157.561 37.1826 158.382C37.1826 159.209 36.7165 159.743 36.028 159.743C35.6837 159.743 35.4348 159.627 35.2336 159.362V160.834ZM35.9592 159.299C36.4199 159.299 36.6953 158.981 36.6953 158.382C36.6953 157.784 36.4199 157.471 35.9592 157.471C35.4931 157.471 35.223 157.784 35.223 158.382C35.223 158.981 35.4931 159.299 35.9592 159.299ZM38.8413 159.743C38.0998 159.743 37.6072 159.209 37.6072 158.382C37.6072 157.561 38.0998 157.026 38.8413 157.026C39.5827 157.026 40.07 157.561 40.07 158.382C40.07 159.209 39.5827 159.743 38.8413 159.743ZM38.8413 159.299C39.302 159.299 39.5721 158.981 39.5721 158.382C39.5721 157.784 39.302 157.471 38.8413 157.471C38.3752 157.471 38.1051 157.784 38.1051 158.382C38.1051 158.981 38.3752 159.299 38.8413 159.299ZM41.1712 159.685H40.6787V157.085H41.15V157.524C41.293 157.207 41.5419 157.058 41.8385 157.058C41.8915 157.058 41.9604 157.064 42.0133 157.079V157.545C41.9339 157.535 41.8915 157.53 41.8227 157.53C41.3831 157.53 41.1712 157.837 41.1712 158.446V159.685ZM43.3714 159.728C42.8471 159.728 42.667 159.463 42.667 159.039V157.53H42.2751V157.085H42.4287C42.5929 157.085 42.667 157.011 42.667 156.846V156.364H43.1596V157.085H43.7527V157.53H43.1596V158.933C43.1596 159.156 43.2125 159.277 43.4932 159.277C43.5939 159.277 43.6627 159.267 43.7527 159.24V159.675C43.6256 159.706 43.4985 159.728 43.3714 159.728ZM45.1684 159.743C44.5275 159.743 44.1409 159.452 44.0668 158.907H44.5699C44.6282 159.209 44.8347 159.33 45.179 159.33C45.5497 159.33 45.751 159.235 45.751 158.986C45.751 158.79 45.6186 158.689 45.2584 158.605L45.0307 158.552C44.4004 158.403 44.1515 158.176 44.1515 157.779C44.1515 157.297 44.5222 157.026 45.1366 157.026C45.7669 157.026 46.1482 157.307 46.2012 157.826H45.698C45.6556 157.545 45.465 157.44 45.1472 157.44C44.8241 157.44 44.644 157.524 44.644 157.752C44.644 157.937 44.7659 158.038 45.1101 158.117L45.3432 158.17C45.9734 158.313 46.2435 158.541 46.2435 158.954C46.2435 159.457 45.841 159.743 45.1684 159.743Z" fill="#AFBBB0"/>
+<g clip-path="url(#clip5_1626_5832)">
+<path d="M40.2222 183.815C40.2222 182.009 38.5611 180.565 36.6111 180.998C35.6 181.215 34.8055 182.081 34.5166 183.092C34.3 184.104 34.5889 185.042 35.1666 185.692C35.6 186.198 35.8889 186.848 35.8889 187.57V188.148H38.7778V187.57C38.7778 186.848 39.0666 186.198 39.5 185.692C39.9333 185.187 40.2222 184.537 40.2222 183.815Z" fill="#8B9C8F"/>
+<path d="M38.0555 190.315H36.6111C36.1777 190.315 35.8889 190.026 35.8889 189.592V188.87H38.7777V189.592C38.7777 190.026 38.4889 190.315 38.0555 190.315Z" fill="#8B9C8F"/>
+<path d="M37.3333 180.204C37.1166 180.204 36.9722 180.059 36.9722 179.842V179.12C36.9722 178.904 37.1166 178.759 37.3333 178.759C37.55 178.759 37.6944 178.904 37.6944 179.12V179.842C37.6944 180.059 37.55 180.204 37.3333 180.204Z" fill="#8B9C8F"/>
+<path d="M39.7166 180.781C39.6444 180.781 39.5 180.781 39.4277 180.709C39.2833 180.565 39.2833 180.348 39.4277 180.204L39.9333 179.698C40.0777 179.554 40.2944 179.554 40.4389 179.698C40.5833 179.842 40.5833 180.059 40.4389 180.204L39.9333 180.709C39.8611 180.709 39.7889 180.781 39.7166 180.781Z" fill="#8B9C8F"/>
+<path d="M34.95 180.781C34.8778 180.781 34.7333 180.781 34.6611 180.709L34.1555 180.131C34.0111 179.987 34.0111 179.77 34.1555 179.626C34.3 179.481 34.5166 179.481 34.6611 179.626L35.1666 180.131C35.3111 180.276 35.3111 180.492 35.1666 180.637C35.1666 180.709 35.0944 180.781 34.95 180.781Z" fill="#8B9C8F"/>
+</g>
+<path d="M29.1757 198.204H28.662V194.496H29.1757V198.204ZM30.4984 198.204H30.0059V195.603H30.4773V195.942C30.6785 195.661 30.9116 195.545 31.2717 195.545C31.8755 195.545 32.1774 195.884 32.1774 196.615V198.204H31.6848V196.657C31.6848 196.191 31.5312 195.995 31.1605 195.995C30.6891 195.995 30.4984 196.313 30.4984 196.842V198.204ZM33.8336 198.262C33.1927 198.262 32.8061 197.971 32.732 197.425H33.2351C33.2934 197.727 33.4999 197.849 33.8442 197.849C34.2149 197.849 34.4162 197.753 34.4162 197.505C34.4162 197.309 34.2838 197.208 33.9236 197.123L33.6959 197.07C33.0656 196.922 32.8167 196.694 32.8167 196.297C32.8167 195.815 33.1874 195.545 33.8018 195.545C34.4321 195.545 34.8134 195.826 34.8664 196.345H34.3632C34.3208 196.064 34.1302 195.958 33.8124 195.958C33.4893 195.958 33.3093 196.043 33.3093 196.27C33.3093 196.456 33.4311 196.556 33.7753 196.636L34.0084 196.689C34.6386 196.832 34.9087 197.06 34.9087 197.473C34.9087 197.976 34.5062 198.262 33.8336 198.262ZM35.7477 195.089C35.5835 195.089 35.4617 194.962 35.4617 194.798C35.4617 194.639 35.5835 194.512 35.7477 194.512C35.9118 194.512 36.0337 194.639 36.0337 194.798C36.0337 194.962 35.9118 195.089 35.7477 195.089ZM35.9913 198.204H35.4987V195.603H35.9913V198.204ZM37.348 197.854H38.2537C38.8469 197.854 39.1646 198.092 39.1646 198.537C39.1646 199.078 38.6986 199.406 37.8035 199.406C36.9932 199.406 36.5853 199.136 36.5853 198.723C36.5853 198.495 36.7125 198.331 36.9614 198.22C36.7125 198.114 36.633 197.902 36.633 197.716C36.633 197.51 36.7601 197.33 36.9773 197.203C36.7919 197.028 36.686 196.79 36.686 196.519C36.686 195.953 37.1203 195.545 37.7823 195.545C37.9995 195.545 38.1901 195.587 38.3543 195.667C38.4814 195.418 38.635 195.227 39.1117 195.206V195.635C38.8627 195.635 38.7197 195.725 38.6456 195.889C38.7939 196.053 38.8786 196.27 38.8786 196.519C38.8786 197.086 38.4443 197.489 37.7823 197.489C37.581 197.489 37.401 197.452 37.2474 197.377C37.1362 197.446 37.0832 197.536 37.0832 197.632C37.0832 197.764 37.1573 197.854 37.348 197.854ZM37.7823 195.947C37.4116 195.947 37.1679 196.18 37.1679 196.519C37.1679 196.858 37.4169 197.086 37.7823 197.086C38.1477 197.086 38.3914 196.858 38.3914 196.519C38.3914 196.175 38.1477 195.947 37.7823 195.947ZM37.8194 199.009C38.3755 199.009 38.6721 198.887 38.6721 198.585C38.6721 198.368 38.5238 198.288 38.2007 198.288H37.3586H37.3321C37.1679 198.373 37.0567 198.468 37.0567 198.643C37.0567 198.871 37.2368 199.009 37.8194 199.009ZM40.1342 198.204H39.6416V194.496H40.1342V195.937C40.3249 195.651 40.5579 195.545 40.9127 195.545C41.5112 195.545 41.8131 195.884 41.8131 196.615V198.204H41.3206V196.657C41.3206 196.191 41.167 195.995 40.7962 195.995C40.3249 195.995 40.1342 196.313 40.1342 196.842V198.204ZM43.374 198.246C42.8497 198.246 42.6696 197.981 42.6696 197.557V196.048H42.2777V195.603H42.4313C42.5954 195.603 42.6696 195.529 42.6696 195.365V194.883H43.1621V195.603H43.7553V196.048H43.1621V197.452C43.1621 197.674 43.2151 197.796 43.4958 197.796C43.5964 197.796 43.6653 197.785 43.7553 197.759V198.193C43.6282 198.225 43.5011 198.246 43.374 198.246ZM45.171 198.262C44.5301 198.262 44.1435 197.971 44.0693 197.425H44.5725C44.6307 197.727 44.8373 197.849 45.1816 197.849C45.5523 197.849 45.7536 197.753 45.7536 197.505C45.7536 197.309 45.6212 197.208 45.261 197.123L45.0333 197.07C44.403 196.922 44.1541 196.694 44.1541 196.297C44.1541 195.815 44.5248 195.545 45.1392 195.545C45.7695 195.545 46.1508 195.826 46.2037 196.345H45.7006C45.6582 196.064 45.4676 195.958 45.1498 195.958C44.8267 195.958 44.6466 196.043 44.6466 196.27C44.6466 196.456 44.7685 196.556 45.1127 196.636L45.3457 196.689C45.976 196.832 46.2461 197.06 46.2461 197.473C46.2461 197.976 45.8436 198.262 45.171 198.262Z" fill="#AFBBB0"/>
+<rect width="34.6667" height="38.5185" transform="translate(20 208.741)" fill="#1A3D32"/>
+<path d="M41.6666 221.972H40.8722C40.8 221.539 40.5833 221.105 40.3666 220.744L40.9444 220.094C41.0889 219.95 41.0889 219.733 40.9444 219.589L40.4389 219.083C40.2944 218.939 40.0777 218.939 39.9333 219.083L39.3555 219.661C38.9222 219.444 38.5611 219.228 38.0555 219.155V218.361C38.0555 218.144 37.9111 218 37.6944 218H36.9722C36.7555 218 36.6111 218.144 36.6111 218.361V219.155C36.1777 219.228 35.7444 219.444 35.3833 219.661L34.8055 219.083C34.6611 218.939 34.4444 218.939 34.3 219.083L33.7944 219.589C33.65 219.733 33.65 219.95 33.7944 220.094L34.3722 220.672C34.0833 221.033 33.8666 221.467 33.7944 221.972H33C32.7833 221.972 32.6389 222.117 32.6389 222.333V223.055C32.6389 223.272 32.7833 223.417 33 223.417H33.7944C33.8666 223.85 34.0833 224.283 34.3 224.644L33.7944 225.222C33.65 225.367 33.65 225.583 33.7944 225.728L34.3 226.233C34.4444 226.378 34.6611 226.378 34.8055 226.233L35.3833 225.655C35.7444 225.944 36.1777 226.089 36.6111 226.233V227.028C36.6111 227.172 36.7555 227.389 36.9722 227.389H37.6944C37.9111 227.389 38.0555 227.172 38.0555 227.028V226.233C38.4889 226.161 38.9222 225.944 39.2833 225.728L39.8611 226.305C40.0055 226.45 40.2222 226.45 40.3666 226.305L40.8722 225.8C41.0166 225.655 41.0166 225.439 40.8722 225.294L40.2944 224.717C40.5111 224.355 40.7277 223.922 40.8 223.489H41.6666C41.8833 223.489 42.0277 223.344 42.0277 223.128V222.333C42.0277 222.117 41.8833 221.972 41.6666 221.972ZM37.3333 223.994C36.6111 223.994 36.0333 223.417 36.0333 222.694C36.0333 221.972 36.6111 221.394 37.3333 221.394C38.0555 221.394 38.6333 221.972 38.6333 222.694C38.6333 223.417 38.0555 223.994 37.3333 223.994Z" fill="#03D47C"/>
+<path d="M29.1707 236.786C28.2015 236.786 27.6136 236.336 27.5977 235.499H28.3392C28.3551 235.928 28.6199 236.145 29.1707 236.145C29.6209 236.145 29.9175 235.997 29.9175 235.684C29.9175 235.456 29.8063 235.34 29.3243 235.229L28.8317 235.123C28.0108 234.937 27.693 234.635 27.693 234.048C27.693 233.444 28.1485 232.951 29.0807 232.951C30.034 232.951 30.5266 233.417 30.5636 234.164H29.8222C29.801 233.793 29.5626 233.592 29.0807 233.592C28.6835 233.592 28.4398 233.724 28.4398 233.989C28.4398 234.212 28.5457 234.323 29.0224 234.429L29.5097 234.54C30.3412 234.731 30.6643 235.033 30.6643 235.621C30.6643 236.399 30.0393 236.786 29.1707 236.786ZM33.5595 235.43V235.562H31.727C31.7693 236.012 32.0024 236.208 32.3201 236.208C32.6326 236.208 32.7703 236.071 32.8339 235.885H33.5595C33.3635 236.584 32.8127 236.786 32.3201 236.786C31.5204 236.786 30.9961 236.251 30.9961 235.414C30.9961 234.434 31.6475 234.053 32.2937 234.053C33.1093 234.053 33.5595 234.641 33.5595 235.43ZM31.7429 235.123H32.8074C32.7756 234.763 32.5903 234.598 32.2937 234.598C32.0289 234.598 31.8117 234.741 31.7429 235.123ZM34.9309 236.775C34.3589 236.775 34.1312 236.468 34.1312 236.044V234.704H33.7657V234.111H33.914C34.0729 234.111 34.1524 234.032 34.1524 233.873V233.401H34.8462V234.111H35.3864V234.704H34.8462V235.875C34.8462 236.071 34.9044 236.166 35.1163 236.166C35.2275 236.166 35.2964 236.145 35.3864 236.118V236.706C35.2487 236.749 35.0686 236.775 34.9309 236.775ZM36.7619 236.775C36.1899 236.775 35.9621 236.468 35.9621 236.044V234.704H35.5967V234.111H35.745C35.9039 234.111 35.9833 234.032 35.9833 233.873V233.401H36.6771V234.111H37.2174V234.704H36.6771V235.875C36.6771 236.071 36.7354 236.166 36.9472 236.166C37.0585 236.166 37.1273 236.145 37.2174 236.118V236.706C37.0797 236.749 36.8996 236.775 36.7619 236.775ZM38.032 233.714C37.8096 233.714 37.6454 233.544 37.6454 233.333C37.6454 233.121 37.8096 232.957 38.032 232.957C38.2545 232.957 38.4187 233.121 38.4187 233.333C38.4187 233.544 38.2545 233.714 38.032 233.714ZM38.3869 236.722H37.6719V234.111H38.3869V236.722ZM39.7472 236.722H39.0322V234.111H39.7048V234.429C39.8849 234.175 40.1338 234.053 40.4516 234.053C41.0924 234.053 41.4102 234.381 41.4102 235.17V236.722H40.7005V235.229C40.7005 234.805 40.5522 234.662 40.2556 234.662C39.9272 234.662 39.7472 234.884 39.7472 235.303V236.722ZM42.6836 236.224H43.5734C44.2248 236.224 44.5373 236.494 44.5373 236.961C44.5373 237.533 44.0447 237.909 43.0967 237.909C42.2758 237.909 41.8309 237.633 41.8309 237.199C41.8309 236.971 41.9633 236.796 42.1963 236.701C41.9633 236.584 41.8891 236.389 41.8891 236.187C41.8891 235.97 42.0269 235.774 42.2705 235.647C42.0851 235.483 41.9792 235.255 41.9792 234.99C41.9792 234.439 42.4294 234.053 43.1073 234.053C43.3244 234.053 43.5151 234.09 43.6793 234.164C43.8223 233.883 43.96 233.698 44.5055 233.672V234.206C44.2619 234.206 44.1136 234.27 44.0341 234.429C44.1613 234.577 44.2354 234.773 44.2354 234.99C44.2407 235.541 43.7852 235.928 43.1073 235.928C42.9166 235.928 42.7471 235.896 42.5936 235.838C42.5035 235.891 42.4559 235.981 42.4559 236.05C42.4559 236.15 42.5088 236.224 42.6836 236.224ZM43.1073 234.567C42.8213 234.567 42.6465 234.741 42.6465 234.99C42.6465 235.239 42.8266 235.409 43.1073 235.409C43.388 235.409 43.5681 235.239 43.5681 234.99C43.5681 234.741 43.388 234.567 43.1073 234.567ZM43.1232 237.384C43.6104 237.384 43.8223 237.268 43.8223 237.024C43.8223 236.87 43.7058 236.796 43.4674 236.796H42.726C42.6889 236.796 42.6571 236.796 42.62 236.791C42.5247 236.86 42.4664 236.945 42.4664 237.066C42.4664 237.257 42.6094 237.384 43.1232 237.384ZM45.9038 236.786C45.1835 236.786 44.7651 236.479 44.7069 235.885H45.4113C45.4536 236.15 45.6178 236.261 45.925 236.261C46.2057 236.261 46.3646 236.182 46.3646 236.002C46.3646 235.864 46.264 235.779 45.9886 235.721L45.7714 235.668C45.0882 235.515 44.7916 235.303 44.7916 234.868C44.7916 234.328 45.1941 234.053 45.8615 234.053C46.5976 234.053 47.0002 234.349 47.0319 234.927H46.3328C46.3169 234.673 46.1633 234.572 45.8879 234.572C45.639 234.572 45.496 234.646 45.496 234.821C45.496 234.953 45.5913 235.038 45.8615 235.096L46.0839 235.144C46.7618 235.297 47.069 235.515 47.069 235.954C47.069 236.5 46.6294 236.786 45.9038 236.786Z" fill="#E7ECE9"/>
+<path d="M42.3889 261.43C42.3889 259.119 40.15 257.241 37.3333 257.241C34.5166 257.241 32.2777 259.119 32.2777 261.43C32.2777 263.741 34.5166 265.619 37.3333 265.619C37.8389 265.619 38.3444 265.546 38.7777 265.474L40.4389 266.269C40.6555 266.413 40.9444 266.196 40.9444 265.98V264.391C41.8111 263.669 42.3889 262.585 42.3889 261.43Z" fill="#8B9C8F"/>
+</g>
+<mask id="path-65-inside-1_1626_5832" fill="white">
+<path d="M54.6666 20H540V54.6667H54.6666V20Z"/>
+</mask>
+<path d="M54.6666 20H540V54.6667H54.6666V20Z" fill="#FAF8F5"/>
+<path d="M65.7648 41.9056C64.7296 41.9056 64.1037 41.725 64.1037 41.4241C64.1037 41.2074 64.3444 41.1112 64.9583 41.063C65.2111 40.8945 65.4277 40.5213 65.8009 39.6426C66.5592 37.825 67.5583 35.3936 67.8352 34.6352C67.9676 34.25 67.9916 34.0213 68.0398 33.8047C68.0879 33.4436 68.3768 33.1787 68.7379 33.1787C69.1231 33.1787 69.3639 33.3954 69.6166 33.9371C70.2426 35.2371 71.5065 38.138 72.2046 39.8834C72.5777 40.8102 72.7102 40.9667 72.8907 41.075C73.4324 41.1112 73.6852 41.2195 73.6852 41.4362C73.6852 41.7612 73.0592 41.9056 71.7352 41.9056C70.375 41.9056 69.7731 41.7371 69.7731 41.4362C69.7731 41.1834 70.05 41.0991 70.8444 41.063C70.9527 40.8824 70.7963 40.2324 70.4111 39.1852L70.3389 38.9926C69.725 38.9565 69.1592 38.9445 68.6176 38.9445C68.0398 38.9445 67.5703 38.9686 66.9805 39.0047C66.9203 39.1612 66.8602 39.3056 66.812 39.45C66.5472 40.1963 66.3907 40.8463 66.5472 41.063C67.2935 41.0871 67.5583 41.1954 67.5583 41.4121C67.5583 41.7371 66.8481 41.9056 65.7648 41.9056ZM67.2935 38.1741C67.7509 38.15 68.1361 38.15 68.6176 38.15C69.0509 38.15 69.5203 38.1621 70.0259 38.1741C69.5805 37.0426 69.087 35.9834 68.6055 34.9843C68.1842 35.9834 67.7027 37.163 67.2935 38.1741ZM76.5133 42.026C74.8522 42.026 73.6966 40.738 73.6966 38.9445C73.6966 37.1389 74.9605 35.6945 76.7059 35.6945C78.1624 35.6945 79.1013 36.7297 79.1013 37.488C79.1013 37.8732 78.8726 38.138 78.5114 38.138C78.054 38.138 77.9216 37.6926 77.6809 37.175C77.5003 36.7899 77.2235 36.3445 76.5374 36.3445C75.5744 36.3445 74.9726 37.2593 74.9726 38.4269C74.9726 39.8593 75.755 40.8343 76.9466 40.8343C77.8013 40.8343 78.3068 40.3287 78.6318 40.0037C78.7763 39.8593 78.8605 39.775 78.9929 39.775C79.1374 39.775 79.2337 39.8834 79.2337 40.088C79.2337 40.3167 79.0892 40.6778 78.8124 40.9908C78.4031 41.4843 77.6087 42.026 76.5133 42.026ZM82.6494 42.026C80.9882 42.026 79.8327 40.738 79.8327 38.9445C79.8327 37.1389 81.0966 35.6945 82.842 35.6945C84.2984 35.6945 85.2373 36.7297 85.2373 37.488C85.2373 37.8732 85.0086 38.138 84.6475 38.138C84.1901 38.138 84.0577 37.6926 83.817 37.175C83.6364 36.7899 83.3595 36.3445 82.6734 36.3445C81.7105 36.3445 81.1086 37.2593 81.1086 38.4269C81.1086 39.8593 81.891 40.8343 83.0827 40.8343C83.9373 40.8343 84.4429 40.3287 84.7679 40.0037C84.9123 39.8593 84.9966 39.775 85.129 39.775C85.2734 39.775 85.3697 39.8834 85.3697 40.088C85.3697 40.3167 85.2253 40.6778 84.9484 40.9908C84.5392 41.4843 83.7447 42.026 82.6494 42.026ZM89.0743 42.026C87.2206 42.026 85.9567 40.7139 85.9567 38.8843C85.9567 37.0065 87.353 35.6945 89.2789 35.6945C91.1206 35.6945 92.3965 37.0065 92.3965 38.8362C92.3965 40.75 90.9641 42.026 89.0743 42.026ZM87.2928 38.3426C87.2928 39.7871 88.1595 41.3519 89.4595 41.3519C90.3743 41.3519 91.0725 40.5936 91.0725 39.3778C91.0725 37.9213 90.1697 36.3686 88.8938 36.3686C87.991 36.3686 87.2928 37.1028 87.2928 38.3426ZM95.7046 42.026C94.6212 42.026 93.7425 41.388 93.7425 39.751V38.126C93.7425 37.5843 93.7185 36.85 93.562 36.7658C92.9842 36.7297 92.8157 36.5732 92.8157 36.3926C92.8157 36.2723 92.8999 36.176 93.0685 36.1037C93.5138 35.9352 94.2722 35.8028 94.6453 35.8028C95.0185 35.8028 95.0786 36.0074 95.0786 36.4649C95.0786 36.8741 95.0666 37.5241 95.0666 38.3667V39.2454C95.0666 40.3889 95.3555 41.075 96.2703 41.075C97.0527 41.075 97.8953 40.4852 97.8953 38.8723V38.126C97.8953 37.5723 97.8592 36.85 97.7147 36.7658C97.0888 36.7297 96.9083 36.5852 96.9083 36.3926C96.9083 36.2723 97.0046 36.176 97.1851 36.1037C97.6305 35.9232 98.4129 35.8028 98.7981 35.8028C99.1592 35.8028 99.2314 36.0074 99.2314 36.4649C99.2314 36.8741 99.2194 37.5482 99.2194 38.4028V39.5584C99.2194 40.1602 99.2435 40.8102 99.3879 40.8824C100.002 40.9186 100.158 41.051 100.158 41.2195C100.158 41.3399 100.086 41.4362 99.9175 41.5324C99.4722 41.7491 98.6175 41.9417 98.2925 41.9417C97.9435 41.9417 97.8712 41.713 97.8712 41.2797C97.8712 41.0871 97.8712 40.8584 97.8833 40.5815C97.486 41.4963 96.6675 42.026 95.7046 42.026ZM106.38 41.9056C105.357 41.9056 104.803 41.7852 104.803 41.4602C104.803 41.2195 105.044 41.1473 105.561 41.1232C105.706 41.063 105.73 40.5093 105.73 39.8593V38.4991C105.73 37.2232 105.357 36.6695 104.478 36.6695C103.695 36.6695 102.853 37.2834 102.853 38.8723V39.8593C102.853 40.6658 102.865 41.063 102.997 41.1232C103.539 41.1593 103.768 41.2195 103.768 41.4602C103.768 41.7973 103.166 41.9056 102.179 41.9056C101.216 41.9056 100.662 41.7852 100.662 41.4602C100.662 41.2195 100.915 41.1473 101.372 41.1232C101.505 41.063 101.529 40.7019 101.529 39.8593V38.1741C101.529 37.6324 101.505 36.9463 101.348 36.8621C100.734 36.826 100.578 36.6936 100.578 36.525C100.578 36.4047 100.638 36.3084 100.819 36.2121C101.264 35.9834 102.119 35.8028 102.444 35.8028C102.793 35.8028 102.865 36.0195 102.865 36.4649V37.175C103.262 36.2482 104.093 35.7186 105.08 35.7186C106.163 35.7186 107.054 36.3565 107.054 37.9936V39.8593C107.054 40.7741 107.054 41.063 107.186 41.1232C107.668 41.1593 107.908 41.2195 107.908 41.4602C107.908 41.7973 107.307 41.9056 106.38 41.9056ZM110.612 41.9417C109.661 41.9417 109.072 41.4362 109.072 40.3649L109.059 36.6936H108.722C108.494 36.6936 108.277 36.5973 108.277 36.3565C108.277 36.0436 108.674 35.6945 109.072 35.3454C109.433 35.0445 109.77 34.7797 110.059 34.7797C110.263 34.7797 110.384 34.9121 110.384 35.1769V35.9352H112.069C112.454 35.9352 112.647 36.0074 112.647 36.2963C112.647 36.5852 112.538 36.6695 112.069 36.6695H110.384V39.8834C110.384 40.6176 110.576 40.9306 111.166 40.9306C111.864 40.9306 112.273 40.413 112.538 40.413C112.671 40.413 112.767 40.5213 112.767 40.6899C112.767 41.1112 111.84 41.9417 110.612 41.9417Z" fill="#002E22"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M118.914 40.5743C119.215 40.8751 119.703 40.8751 120.004 40.5743L123.245 37.3333L120.004 34.0922C119.703 33.7914 119.215 33.7914 118.914 34.0922C118.614 34.3931 118.614 34.8808 118.914 35.1817L121.066 37.3333L118.914 39.4848C118.614 39.7857 118.614 40.2734 118.914 40.5743Z" fill="#8B9C8F"/>
+<path d="M134.057 40.3334H132.845L132.395 39.0237H130.316L129.874 40.3334H128.687L130.791 34.6037H131.961L134.057 40.3334ZM131.347 35.9625L130.652 38.017H132.051L131.347 35.9625ZM136.174 40.4316C134.971 40.4316 134.185 39.6049 134.185 38.3116C134.185 37.0347 134.995 36.208 136.207 36.208C137.197 36.208 137.958 36.7073 138.089 37.7305H136.968C136.829 37.3212 136.567 37.1248 136.174 37.1248C135.626 37.1248 135.282 37.5504 135.282 38.3116C135.282 39.0729 135.617 39.5067 136.174 39.5067C136.575 39.5067 136.87 39.2857 136.984 38.8355H138.098C137.934 39.8341 137.197 40.4316 136.174 40.4316ZM140.498 40.4316C139.295 40.4316 138.509 39.6049 138.509 38.3116C138.509 37.0347 139.32 36.208 140.531 36.208C141.522 36.208 142.283 36.7073 142.414 37.7305H141.292C141.153 37.3212 140.891 37.1248 140.498 37.1248C139.95 37.1248 139.606 37.5504 139.606 38.3116C139.606 39.0729 139.942 39.5067 140.498 39.5067C140.9 39.5067 141.194 39.2857 141.309 38.8355H142.422C142.258 39.8341 141.522 40.4316 140.498 40.4316ZM144.856 40.4316C143.636 40.4316 142.834 39.6049 142.834 38.3116C142.834 37.0347 143.636 36.208 144.856 36.208C146.083 36.208 146.877 37.0347 146.877 38.3116C146.877 39.6049 146.083 40.4316 144.856 40.4316ZM144.856 39.5067C145.429 39.5067 145.772 39.0729 145.772 38.3116C145.772 37.5504 145.429 37.1248 144.856 37.1248C144.274 37.1248 143.931 37.5504 143.931 38.3116C143.931 39.0729 144.274 39.5067 144.856 39.5067ZM149.036 40.4152C148.062 40.4152 147.571 39.8996 147.571 38.68V36.2981H148.667V38.5981C148.667 39.2611 148.897 39.4821 149.347 39.4821C149.821 39.4821 150.1 39.1383 150.1 38.4835V36.2981H151.205V40.3334H150.165V39.8259C149.895 40.227 149.519 40.4152 149.036 40.4152ZM153.305 40.3334H152.2V36.2981H153.239V36.7892C153.518 36.3963 153.902 36.208 154.393 36.208C155.384 36.208 155.875 36.7155 155.875 37.9351V40.3334H154.778V38.0252C154.778 37.3703 154.549 37.1493 154.091 37.1493C153.583 37.1493 153.305 37.4931 153.305 38.1397V40.3334ZM158.211 40.4152C157.327 40.4152 156.975 39.9405 156.975 39.2857V37.2148H156.411V36.2981H156.64C156.885 36.2981 157.008 36.1753 157.008 35.9297V35.2013H158.08V36.2981H158.915V37.2148H158.08V39.0237C158.08 39.3266 158.17 39.4739 158.498 39.4739C158.67 39.4739 158.776 39.4412 158.915 39.4003V40.3088C158.702 40.3743 158.424 40.4152 158.211 40.4152ZM163.784 40.3334H161.77V34.6037H163.702C165.568 34.6037 166.747 35.6678 166.747 37.444C166.747 39.2366 165.601 40.3334 163.784 40.3334ZM162.916 35.6678V39.2693H163.751C164.905 39.2693 165.601 38.5981 165.601 37.4604C165.601 36.3144 164.905 35.6678 163.751 35.6678H162.916ZM171.327 38.3362V38.5408H168.495C168.56 39.2366 168.921 39.5394 169.412 39.5394C169.895 39.5394 170.107 39.3266 170.206 39.0401H171.327C171.024 40.1206 170.173 40.4316 169.412 40.4316C168.176 40.4316 167.365 39.6049 167.365 38.3116C167.365 36.7974 168.372 36.208 169.371 36.208C170.631 36.208 171.327 37.1166 171.327 38.3362ZM168.52 37.8614H170.165C170.116 37.3049 169.829 37.0511 169.371 37.0511C168.962 37.0511 168.626 37.2721 168.52 37.8614ZM173.447 40.4152C172.563 40.4152 172.211 39.9405 172.211 39.2857V37.2148H171.646V36.2981H171.875C172.121 36.2981 172.243 36.1753 172.243 35.9297V35.2013H173.316V36.2981H174.151V37.2148H173.316V39.0237C173.316 39.3266 173.406 39.4739 173.733 39.4739C173.905 39.4739 174.011 39.4412 174.151 39.4003V40.3088C173.938 40.3743 173.659 40.4152 173.447 40.4152ZM176.508 36.208C177.711 36.208 178.235 36.7073 178.235 37.9024V40.3334H177.195V39.8095C176.958 40.1615 176.565 40.4316 175.992 40.4316C175.125 40.4316 174.584 39.9896 174.584 39.2611C174.584 38.4344 175.288 37.9924 176.369 37.9924C176.68 37.9924 176.909 38.017 177.138 38.0661V37.7469C177.138 37.2476 176.917 37.0347 176.467 37.0347C176.033 37.0347 175.804 37.2639 175.779 37.5832H174.683C174.764 36.65 175.526 36.208 176.508 36.208ZM176.295 39.5967C176.737 39.5967 177.138 39.2857 177.138 38.7946V38.7454C176.934 38.6882 176.753 38.6636 176.467 38.6636C175.976 38.6636 175.681 38.8191 175.681 39.1547C175.681 39.433 175.869 39.5967 176.295 39.5967ZM179.742 35.6842C179.398 35.6842 179.144 35.4223 179.144 35.0949C179.144 34.7674 179.398 34.5137 179.742 34.5137C180.086 34.5137 180.339 34.7674 180.339 35.0949C180.339 35.4223 180.086 35.6842 179.742 35.6842ZM180.29 40.3334H179.185V36.2981H180.29V40.3334ZM182.442 40.3825C181.64 40.3825 181.288 40.0223 181.288 39.2939V34.6037H182.393V39.0401C182.393 39.3266 182.466 39.4576 182.728 39.4576C182.769 39.4576 182.818 39.4576 182.867 39.4494V40.3334C182.761 40.3579 182.63 40.3825 182.442 40.3825ZM185.089 40.4316C183.976 40.4316 183.329 39.9569 183.239 39.0401H184.328C184.393 39.4494 184.647 39.6213 185.122 39.6213C185.556 39.6213 185.801 39.4985 185.801 39.2202C185.801 39.0074 185.646 38.8764 185.22 38.7864L184.884 38.7045C183.829 38.4672 183.37 38.1397 183.37 37.4686C183.37 36.6337 183.992 36.208 185.024 36.208C186.161 36.208 186.783 36.6664 186.833 37.5586H185.752C185.728 37.1657 185.49 37.0102 185.065 37.0102C184.68 37.0102 184.459 37.1248 184.459 37.3949C184.459 37.5995 184.606 37.7305 185.024 37.8205L185.367 37.8942C186.415 38.1316 186.89 38.4672 186.89 39.1465C186.89 39.9896 186.21 40.4316 185.089 40.4316Z" fill="#002E22"/>
+<path d="M540 54.1852H54.6666V55.1481H540V54.1852Z" fill="#EBE6DF" mask="url(#path-65-inside-1_1626_5832)"/>
+<mask id="path-70-inside-2_1626_5832" fill="white">
+<path d="M54.6666 54.6666H146.148V410.963H54.6666V54.6666Z"/>
+</mask>
+<path d="M54.6666 54.6666H146.148V410.963H54.6666V54.6666Z" fill="#FAF8F5"/>
+<rect x="64.2963" y="64.2963" width="1.44444" height="11.5556" fill="#03D47C"/>
+<path d="M76.0935 72.0741H75.1672L74.8229 71.0726H73.233L72.895 72.0741H71.9875L73.5961 67.6926H74.4912L76.0935 72.0741ZM74.0217 68.7317L73.4897 70.3027H74.56L74.0217 68.7317ZM77.7126 72.1492C76.7925 72.1492 76.1916 71.517 76.1916 70.5281C76.1916 69.5516 76.8113 68.9194 77.7377 68.9194C78.495 68.9194 79.0771 69.3012 79.1773 70.0837H78.3198C78.2134 69.7707 78.0131 69.6205 77.7126 69.6205C77.2932 69.6205 77.0304 69.9459 77.0304 70.5281C77.0304 71.1102 77.287 71.4419 77.7126 71.4419C78.0193 71.4419 78.2447 71.2729 78.3323 70.9287H79.1835C79.0584 71.6923 78.495 72.1492 77.7126 72.1492ZM81.0195 72.1492C80.0994 72.1492 79.4985 71.517 79.4985 70.5281C79.4985 69.5516 80.1182 68.9194 81.0446 68.9194C81.8019 68.9194 82.384 69.3012 82.4842 70.0837H81.6267C81.5203 69.7707 81.32 69.6205 81.0195 69.6205C80.6001 69.6205 80.3373 69.9459 80.3373 70.5281C80.3373 71.1102 80.5939 71.4419 81.0195 71.4419C81.3262 71.4419 81.5516 71.2729 81.6392 70.9287H82.4904C82.3653 71.6923 81.8019 72.1492 81.0195 72.1492ZM84.3514 72.1492C83.4188 72.1492 82.8054 71.517 82.8054 70.5281C82.8054 69.5516 83.4188 68.9194 84.3514 68.9194C85.2903 68.9194 85.8975 69.5516 85.8975 70.5281C85.8975 71.517 85.2903 72.1492 84.3514 72.1492ZM84.3514 71.4419C84.7896 71.4419 85.0525 71.1102 85.0525 70.5281C85.0525 69.9459 84.7896 69.6205 84.3514 69.6205C83.907 69.6205 83.6441 69.9459 83.6441 70.5281C83.6441 71.1102 83.907 71.4419 84.3514 71.4419ZM87.548 72.1367C86.8031 72.1367 86.4276 71.7424 86.4276 70.8097V68.9883H87.2663V70.7471C87.2663 71.2541 87.4416 71.4231 87.7858 71.4231C88.1489 71.4231 88.3617 71.1602 88.3617 70.6595V68.9883H89.2067V72.0741H88.4117V71.686C88.2052 71.9927 87.9173 72.1367 87.548 72.1367ZM90.8126 72.0741H89.9676V68.9883H90.7625V69.3638C90.9754 69.0634 91.2695 68.9194 91.6451 68.9194C92.4025 68.9194 92.778 69.3075 92.778 70.2401V72.0741H91.9393V70.309C91.9393 69.8082 91.764 69.6392 91.4135 69.6392C91.0254 69.6392 90.8126 69.9021 90.8126 70.3966V72.0741ZM94.5646 72.1367C93.8886 72.1367 93.6195 71.7737 93.6195 71.2729V69.6893H93.1876V68.9883H93.3628C93.5506 68.9883 93.6445 68.8944 93.6445 68.7066V68.1495H94.4645V68.9883H95.1029V69.6893H94.4645V71.0726C94.4645 71.3042 94.5333 71.4169 94.7837 71.4169C94.9151 71.4169 94.9965 71.3918 95.1029 71.3605V72.0553C94.9402 72.1054 94.7273 72.1367 94.5646 72.1367ZM98.8259 72.0741H97.2861V67.6926H98.7633C100.19 67.6926 101.092 68.5063 101.092 69.8646C101.092 71.2354 100.215 72.0741 98.8259 72.0741ZM98.1624 68.5063V71.2604H98.8008C99.6834 71.2604 100.215 70.7471 100.215 69.8771C100.215 69.0008 99.6834 68.5063 98.8008 68.5063H98.1624ZM104.594 70.5468V70.7033H102.429C102.479 71.2354 102.754 71.4669 103.13 71.4669C103.499 71.4669 103.662 71.3042 103.737 71.0851H104.594C104.363 71.9114 103.712 72.1492 103.13 72.1492C102.185 72.1492 101.565 71.517 101.565 70.5281C101.565 69.3701 102.335 68.9194 103.098 68.9194C104.062 68.9194 104.594 69.6142 104.594 70.5468ZM102.447 70.1838H103.706C103.668 69.7582 103.449 69.5641 103.098 69.5641C102.785 69.5641 102.529 69.7331 102.447 70.1838ZM106.215 72.1367C105.539 72.1367 105.27 71.7737 105.27 71.2729V69.6893H104.838V68.9883H105.013C105.201 68.9883 105.295 68.8944 105.295 68.7066V68.1495H106.115V68.9883H106.753V69.6893H106.115V71.0726C106.115 71.3042 106.184 71.4169 106.434 71.4169C106.566 71.4169 106.647 71.3918 106.753 71.3605V72.0553C106.591 72.1054 106.378 72.1367 106.215 72.1367ZM108.556 68.9194C109.476 68.9194 109.877 69.3012 109.877 70.2151V72.0741H109.082V71.6735C108.9 71.9427 108.6 72.1492 108.162 72.1492C107.498 72.1492 107.085 71.8112 107.085 71.2541C107.085 70.6219 107.624 70.2839 108.45 70.2839C108.688 70.2839 108.863 70.3027 109.038 70.3403V70.0962C109.038 69.7144 108.869 69.5516 108.525 69.5516C108.193 69.5516 108.018 69.7269 107.999 69.971H107.16C107.223 69.2574 107.805 68.9194 108.556 68.9194ZM108.393 71.5108C108.731 71.5108 109.038 71.2729 109.038 70.8974V70.8598C108.882 70.816 108.744 70.7972 108.525 70.7972C108.149 70.7972 107.924 70.9161 107.924 71.1728C107.924 71.3856 108.068 71.5108 108.393 71.5108ZM111.029 68.5188C110.766 68.5188 110.572 68.3185 110.572 68.0682C110.572 67.8178 110.766 67.6238 111.029 67.6238C111.292 67.6238 111.486 67.8178 111.486 68.0682C111.486 68.3185 111.292 68.5188 111.029 68.5188ZM111.449 72.0741H110.604V68.9883H111.449V72.0741ZM113.094 72.1117C112.48 72.1117 112.211 71.8362 112.211 71.2792V67.6926H113.056V71.0851C113.056 71.3042 113.113 71.4044 113.313 71.4044C113.344 71.4044 113.382 71.4044 113.419 71.3981V72.0741C113.338 72.0929 113.238 72.1117 113.094 72.1117ZM115.118 72.1492C114.267 72.1492 113.773 71.7862 113.704 71.0851H114.536C114.586 71.3981 114.78 71.5295 115.143 71.5295C115.475 71.5295 115.663 71.4357 115.663 71.2228C115.663 71.0601 115.544 70.9599 115.218 70.8911L114.962 70.8285C114.154 70.647 113.804 70.3966 113.804 69.8834C113.804 69.2449 114.28 68.9194 115.068 68.9194C115.938 68.9194 116.414 69.2699 116.451 69.9522H115.625C115.606 69.6518 115.425 69.5328 115.099 69.5328C114.805 69.5328 114.636 69.6205 114.636 69.827C114.636 69.9835 114.749 70.0837 115.068 70.1525L115.331 70.2088C116.132 70.3904 116.495 70.647 116.495 71.1665C116.495 71.8112 115.976 72.1492 115.118 72.1492Z" fill="#002E22"/>
+<path d="M73.1204 88.4445H72.5132V84.063H74.1281C75.1046 84.063 75.6742 84.6075 75.6742 85.4901C75.6742 86.3726 75.1046 86.9172 74.1281 86.9172H73.1204V88.4445ZM73.1204 84.6263V86.3539H74.1156C74.7353 86.3539 75.067 86.0597 75.067 85.4901C75.067 84.9205 74.7353 84.6263 74.1156 84.6263H73.1204ZM76.9208 88.4445H76.3387V85.3712H76.8957V85.8907C77.0647 85.5151 77.3589 85.3399 77.7094 85.3399C77.772 85.3399 77.8534 85.3461 77.916 85.3649V85.9157C77.8221 85.9032 77.772 85.8969 77.6907 85.8969C77.1711 85.8969 76.9208 86.26 76.9208 86.9798V88.4445ZM81.0448 86.8108V87.0173H78.8353C78.8666 87.6808 79.2171 88.0001 79.7053 88.0001C80.0871 88.0001 80.2999 87.8623 80.4314 87.5494H81.0323C80.8069 88.2379 80.2812 88.5133 79.7053 88.5133C78.8415 88.5133 78.2406 87.8811 78.2406 86.9047C78.2406 85.8406 78.8854 85.3023 79.6865 85.3023C80.519 85.3023 81.0448 85.9345 81.0448 86.8108ZM78.8541 86.5792H80.4376C80.4001 86.0534 80.1309 85.8031 79.6865 85.8031C79.2421 85.8031 78.9354 86.0472 78.8541 86.5792ZM82.4429 88.4445H81.8671V85.8969H81.4039V85.3712H81.8608V84.8329C81.8608 84.3008 82.1925 83.9941 82.7746 83.9941C82.9061 83.9941 83.0313 84.0129 83.1502 84.0442V84.57C83.0563 84.5387 82.9687 84.5262 82.8748 84.5262C82.5931 84.5262 82.4429 84.6201 82.4429 84.9268V85.3712H83.0876V85.8969H82.4429V88.4445ZM86.1671 86.8108V87.0173H83.9576C83.9889 87.6808 84.3394 88.0001 84.8276 88.0001C85.2095 88.0001 85.4223 87.8623 85.5537 87.5494H86.1546C85.9293 88.2379 85.4035 88.5133 84.8276 88.5133C83.9639 88.5133 83.363 87.8811 83.363 86.9047C83.363 85.8406 84.0077 85.3023 84.8089 85.3023C85.6413 85.3023 86.1671 85.9345 86.1671 86.8108ZM83.9764 86.5792H85.56C85.5224 86.0534 85.2533 85.8031 84.8089 85.8031C84.3645 85.8031 84.0577 86.0472 83.9764 86.5792ZM87.4588 88.4445H86.8767V85.3712H87.4338V85.8907C87.6028 85.5151 87.897 85.3399 88.2475 85.3399C88.3101 85.3399 88.3915 85.3461 88.454 85.3649V85.9157C88.3602 85.9032 88.3101 85.8969 88.2287 85.8969C87.7092 85.8969 87.4588 86.26 87.4588 86.9798V88.4445ZM91.5828 86.8108V87.0173H89.3733C89.4046 87.6808 89.7551 88.0001 90.2434 88.0001C90.6252 88.0001 90.838 87.8623 90.9694 87.5494H91.5703C91.345 88.2379 90.8192 88.5133 90.2434 88.5133C89.3796 88.5133 88.7787 87.8811 88.7787 86.9047C88.7787 85.8406 89.4234 85.3023 90.2246 85.3023C91.0571 85.3023 91.5828 85.9345 91.5828 86.8108ZM89.3921 86.5792H90.9757C90.9381 86.0534 90.669 85.8031 90.2246 85.8031C89.7802 85.8031 89.4735 86.0472 89.3921 86.5792ZM92.8745 88.4445H92.2924V85.3712H92.8495V85.7718C93.0874 85.44 93.3628 85.3023 93.7884 85.3023C94.502 85.3023 94.8587 85.7029 94.8587 86.5667V88.4445H94.2766V86.6168C94.2766 86.0659 94.0951 85.8343 93.657 85.8343C93.0999 85.8343 92.8745 86.2099 92.8745 86.8358V88.4445ZM96.9788 88.5133C96.1088 88.5133 95.5392 87.8811 95.5392 86.9047C95.5392 85.9345 96.1088 85.3023 96.9788 85.3023C97.6611 85.3023 98.1869 85.6841 98.3308 86.3601H97.7362C97.611 85.9971 97.3481 85.8281 96.9788 85.8281C96.4405 85.8281 96.115 86.2036 96.115 86.9047C96.115 87.6057 96.4405 87.9875 96.9788 87.9875C97.3544 87.9875 97.6235 87.8248 97.7424 87.4117H98.3371C98.1931 88.1065 97.6736 88.5133 96.9788 88.5133ZM101.559 86.8108V87.0173H99.349C99.3803 87.6808 99.7308 88.0001 100.219 88.0001C100.601 88.0001 100.814 87.8623 100.945 87.5494H101.546C101.321 88.2379 100.795 88.5133 100.219 88.5133C99.3553 88.5133 98.7544 87.8811 98.7544 86.9047C98.7544 85.8406 99.3991 85.3023 100.2 85.3023C101.033 85.3023 101.559 85.9345 101.559 86.8108ZM99.3678 86.5792H100.951C100.914 86.0534 100.645 85.8031 100.2 85.8031C99.7559 85.8031 99.4492 86.0472 99.3678 86.5792ZM103.326 88.5133C102.569 88.5133 102.112 88.1691 102.024 87.5243H102.619C102.688 87.8811 102.932 88.0251 103.338 88.0251C103.777 88.0251 104.014 87.9124 104.014 87.6182C104.014 87.3866 103.858 87.2677 103.432 87.1676L103.163 87.105C102.418 86.9297 102.124 86.6606 102.124 86.1911C102.124 85.6215 102.562 85.3023 103.288 85.3023C104.033 85.3023 104.484 85.6341 104.547 86.2475H103.952C103.902 85.9157 103.676 85.7905 103.301 85.7905C102.919 85.7905 102.706 85.8907 102.706 86.1598C102.706 86.3789 102.85 86.4978 103.257 86.5917L103.533 86.6543C104.277 86.8233 104.597 87.0925 104.597 87.5807C104.597 88.1753 104.121 88.5133 103.326 88.5133Z" fill="#76847E"/>
+<path d="M75.574 104.815H72.5132V100.433H75.4989V100.997H73.1204V102.286H75.1922V102.849H73.1204V104.251H75.574V104.815ZM76.565 104.815H75.9078L76.9531 103.237L75.9641 101.742H76.6339L77.2974 102.781L77.9546 101.742H78.6118L77.6166 103.225L78.6681 104.815H77.9984L77.2723 103.682L76.565 104.815ZM79.7998 106.173H79.2177V101.742H79.7748V102.142C80.0376 101.81 80.3318 101.673 80.7387 101.673C81.5649 101.673 82.1032 102.305 82.1032 103.275C82.1032 104.251 81.5524 104.884 80.7387 104.884C80.3318 104.884 80.0376 104.746 79.7998 104.433V106.173ZM80.6573 104.358C81.2019 104.358 81.5273 103.982 81.5273 103.275C81.5273 102.568 81.2019 102.198 80.6573 102.198C80.1065 102.198 79.7873 102.568 79.7873 103.275C79.7873 103.982 80.1065 104.358 80.6573 104.358ZM85.4092 103.181V103.388H83.1996C83.2309 104.051 83.5815 104.37 84.0697 104.37C84.4515 104.37 84.6643 104.233 84.7958 103.92H85.3966C85.1713 104.608 84.6455 104.884 84.0697 104.884C83.2059 104.884 82.605 104.251 82.605 103.275C82.605 102.211 83.2497 101.673 84.0509 101.673C84.8834 101.673 85.4092 102.305 85.4092 103.181ZM83.2184 102.95H84.802C84.7645 102.424 84.4953 102.173 84.0509 102.173C83.6065 102.173 83.2998 102.418 83.2184 102.95ZM86.7009 104.815H86.1188V101.742H86.6758V102.142C86.9137 101.81 87.1891 101.673 87.6147 101.673C88.3283 101.673 88.6851 102.073 88.6851 102.937V104.815H88.1029V102.987C88.1029 102.436 87.9214 102.205 87.4833 102.205C86.9262 102.205 86.7009 102.58 86.7009 103.206V104.815ZM90.6424 104.884C89.885 104.884 89.4281 104.539 89.3405 103.895H89.9351C90.0039 104.251 90.2481 104.395 90.6549 104.395C91.0931 104.395 91.3309 104.283 91.3309 103.989C91.3309 103.757 91.1744 103.638 90.7488 103.538L90.4796 103.475C89.7348 103.3 89.4406 103.031 89.4406 102.561C89.4406 101.992 89.8788 101.673 90.6048 101.673C91.3497 101.673 91.8004 102.004 91.8629 102.618H91.2683C91.2182 102.286 90.9929 102.161 90.6174 102.161C90.2355 102.161 90.0227 102.261 90.0227 102.53C90.0227 102.749 90.1667 102.868 90.5735 102.962L90.8489 103.025C91.5938 103.194 91.913 103.463 91.913 103.951C91.913 104.546 91.4373 104.884 90.6424 104.884ZM95.1954 103.181V103.388H92.9858C93.0171 104.051 93.3677 104.37 93.8559 104.37C94.2377 104.37 94.4505 104.233 94.582 103.92H95.1828C94.9575 104.608 94.4317 104.884 93.8559 104.884C92.9921 104.884 92.3912 104.251 92.3912 103.275C92.3912 102.211 93.0359 101.673 93.8371 101.673C94.6696 101.673 95.1954 102.305 95.1954 103.181ZM93.0046 102.95H94.5882C94.5507 102.424 94.2815 102.173 93.8371 102.173C93.3927 102.173 93.086 102.418 93.0046 102.95ZM100.527 103.444L101.053 104.815H100.395L99.926 103.588C99.782 103.206 99.6443 103.15 99.2688 103.15H98.2736V104.815H97.6664V100.433H99.3814C100.345 100.433 100.909 100.934 100.909 101.773C100.909 102.361 100.596 102.737 100.12 102.887C100.32 102.987 100.42 103.162 100.527 103.444ZM98.2736 100.997V102.587H99.3752C99.9823 102.587 100.302 102.317 100.302 101.785C100.302 101.266 99.9823 100.997 99.3752 100.997H98.2736ZM102.671 104.877C101.964 104.877 101.607 104.477 101.607 103.613V101.742H102.189V103.563C102.189 104.114 102.371 104.345 102.809 104.345C103.335 104.345 103.56 103.97 103.56 103.344V101.742H104.142V104.815H103.585V104.402C103.366 104.74 103.091 104.877 102.671 104.877ZM105.844 104.852C105.293 104.852 105.08 104.602 105.08 104.108V100.433H105.662V103.989C105.662 104.233 105.737 104.339 105.956 104.339C106 104.339 106.044 104.339 106.094 104.333V104.821C106.025 104.84 105.931 104.852 105.844 104.852ZM109.254 103.181V103.388H107.045C107.076 104.051 107.427 104.37 107.915 104.37C108.297 104.37 108.509 104.233 108.641 103.92H109.242C109.016 104.608 108.491 104.884 107.915 104.884C107.051 104.884 106.45 104.251 106.45 103.275C106.45 102.211 107.095 101.673 107.896 101.673C108.728 101.673 109.254 102.305 109.254 103.181ZM107.064 102.95H108.647C108.61 102.424 108.34 102.173 107.896 102.173C107.452 102.173 107.145 102.418 107.064 102.95ZM111.022 104.884C110.264 104.884 109.807 104.539 109.72 103.895H110.314C110.383 104.251 110.627 104.395 111.034 104.395C111.472 104.395 111.71 104.283 111.71 103.989C111.71 103.757 111.554 103.638 111.128 103.538L110.859 103.475C110.114 103.3 109.82 103.031 109.82 102.561C109.82 101.992 110.258 101.673 110.984 101.673C111.729 101.673 112.18 102.004 112.242 102.618H111.648C111.598 102.286 111.372 102.161 110.997 102.161C110.615 102.161 110.402 102.261 110.402 102.53C110.402 102.749 110.546 102.868 110.953 102.962L111.228 103.025C111.973 103.194 112.292 103.463 112.292 103.951C112.292 104.546 111.817 104.884 111.022 104.884Z" fill="#76847E"/>
+<path d="M74.3472 121.254C73.1204 121.254 72.3129 120.347 72.3129 118.988C72.3129 117.661 73.1329 116.735 74.3597 116.735C75.3111 116.735 75.9934 117.286 76.25 118.193H75.6116C75.3925 117.586 74.9731 117.298 74.3597 117.298C73.4709 117.298 72.9201 117.949 72.9201 118.995C72.9201 120.04 73.4709 120.691 74.3597 120.691C74.9856 120.691 75.4113 120.39 75.6178 119.746H76.2437C75.9996 120.691 75.3111 121.254 74.3472 121.254ZM77.5809 121.185H76.9988V118.112H77.5559V118.632C77.7249 118.256 78.0191 118.081 78.3696 118.081C78.4322 118.081 78.5136 118.087 78.5762 118.106V118.657C78.4823 118.644 78.4322 118.638 78.3508 118.638C77.8313 118.638 77.5809 119.001 77.5809 119.721V121.185ZM81.705 119.552V119.758H79.4954C79.5267 120.422 79.8772 120.741 80.3655 120.741C80.7473 120.741 80.9601 120.603 81.0915 120.29H81.6924C81.4671 120.979 80.9413 121.254 80.3655 121.254C79.5017 121.254 78.9008 120.622 78.9008 119.646C78.9008 118.581 79.5455 118.043 80.3467 118.043C81.1792 118.043 81.705 118.675 81.705 119.552ZM79.5142 119.32H81.0978C81.0602 118.794 80.7911 118.544 80.3467 118.544C79.9023 118.544 79.5956 118.788 79.5142 119.32ZM83.56 121.254C82.7338 121.254 82.1955 120.622 82.1955 119.646C82.1955 118.675 82.7463 118.043 83.56 118.043C83.9668 118.043 84.2297 118.168 84.4989 118.488V116.804H85.081V121.185H84.5239V120.772C84.236 121.11 83.9668 121.254 83.56 121.254ZM83.6414 120.728C84.1922 120.728 84.5114 120.353 84.5114 119.646C84.5114 118.938 84.1922 118.569 83.6414 118.569C83.0968 118.569 82.7713 118.938 82.7713 119.646C82.7713 120.353 83.0968 120.728 83.6414 120.728ZM86.3151 117.505C86.1211 117.505 85.9771 117.355 85.9771 117.161C85.9771 116.973 86.1211 116.823 86.3151 116.823C86.5092 116.823 86.6531 116.973 86.6531 117.161C86.6531 117.355 86.5092 117.505 86.3151 117.505ZM86.6031 121.185H86.021V118.112H86.6031V121.185ZM88.4881 121.235C87.8685 121.235 87.6556 120.922 87.6556 120.422V118.638H87.1925V118.112H87.374C87.568 118.112 87.6556 118.024 87.6556 117.83V117.261H88.2378V118.112H88.9388V118.638H88.2378V120.296C88.2378 120.559 88.3004 120.703 88.6321 120.703C88.751 120.703 88.8324 120.691 88.9388 120.66V121.173C88.7886 121.21 88.6384 121.235 88.4881 121.235ZM93.1311 121.254C91.9043 121.254 91.0968 120.347 91.0968 118.988C91.0968 117.661 91.9168 116.735 93.1436 116.735C94.095 116.735 94.7773 117.286 95.0339 118.193H94.3955C94.1764 117.586 93.757 117.298 93.1436 117.298C92.2548 117.298 91.704 117.949 91.704 118.995C91.704 120.04 92.2548 120.691 93.1436 120.691C93.7695 120.691 94.1952 120.39 94.4017 119.746H95.0276C94.7835 120.691 94.095 121.254 93.1311 121.254ZM96.8801 118.043C97.6751 118.043 98.1007 118.394 98.1007 119.282V121.185H97.5436V120.76C97.3558 121.029 97.0679 121.254 96.5859 121.254C95.9663 121.254 95.5281 120.935 95.5281 120.39C95.5281 119.758 96.0602 119.433 96.8488 119.433C97.0804 119.433 97.287 119.451 97.5186 119.502V119.189C97.5186 118.725 97.2807 118.544 96.8676 118.544C96.4482 118.544 96.2354 118.725 96.1916 119.045H95.6032C95.6533 118.4 96.1791 118.043 96.8801 118.043ZM96.6986 120.766C97.1368 120.766 97.5186 120.447 97.5186 120.002V119.952C97.2995 119.896 97.1117 119.871 96.8676 119.871C96.3982 119.871 96.1165 120.021 96.1165 120.34C96.1165 120.609 96.298 120.766 96.6986 120.766ZM99.5861 121.185H99.004V118.112H99.5611V118.632C99.7301 118.256 100.024 118.081 100.375 118.081C100.437 118.081 100.519 118.087 100.581 118.106V118.657C100.487 118.644 100.437 118.638 100.356 118.638C99.8365 118.638 99.5861 119.001 99.5861 119.721V121.185ZM102.271 121.254C101.444 121.254 100.906 120.622 100.906 119.646C100.906 118.675 101.457 118.043 102.271 118.043C102.677 118.043 102.94 118.168 103.209 118.488V116.804H103.792V121.185H103.234V120.772C102.947 121.11 102.677 121.254 102.271 121.254ZM102.352 120.728C102.903 120.728 103.222 120.353 103.222 119.646C103.222 118.938 102.903 118.569 102.352 118.569C101.807 118.569 101.482 118.938 101.482 119.646C101.482 120.353 101.807 120.728 102.352 120.728ZM107.1 121.185H106.493V116.804H107.1V121.185ZM111.442 118.043C112.15 118.043 112.506 118.444 112.506 119.308V121.185H111.924V119.345C111.924 118.807 111.755 118.575 111.336 118.575C110.804 118.575 110.585 118.951 110.585 119.602V121.185H110.003V119.345C110.003 118.807 109.828 118.575 109.414 118.575C108.876 118.575 108.663 118.951 108.663 119.602V121.185H108.081V118.112H108.638V118.513C108.876 118.181 109.133 118.043 109.54 118.043C109.971 118.043 110.278 118.212 110.447 118.588C110.66 118.225 111.004 118.043 111.442 118.043ZM113.945 122.544H113.362V118.112H113.92V118.513C114.182 118.181 114.477 118.043 114.883 118.043C115.71 118.043 116.248 118.675 116.248 119.646C116.248 120.622 115.697 121.254 114.883 121.254C114.477 121.254 114.182 121.116 113.945 120.803V122.544ZM114.802 120.728C115.347 120.728 115.672 120.353 115.672 119.646C115.672 118.938 115.347 118.569 114.802 118.569C114.251 118.569 113.932 118.938 113.932 119.646C113.932 120.353 114.251 120.728 114.802 120.728ZM118.208 121.254C117.332 121.254 116.75 120.622 116.75 119.646C116.75 118.675 117.332 118.043 118.208 118.043C119.084 118.043 119.66 118.675 119.66 119.646C119.66 120.622 119.084 121.254 118.208 121.254ZM118.208 120.728C118.753 120.728 119.072 120.353 119.072 119.646C119.072 118.938 118.753 118.569 118.208 118.569C117.657 118.569 117.338 118.938 117.338 119.646C117.338 120.353 117.657 120.728 118.208 120.728ZM120.962 121.185H120.38V118.112H120.937V118.632C121.106 118.256 121.4 118.081 121.75 118.081C121.813 118.081 121.894 118.087 121.957 118.106V118.657C121.863 118.644 121.813 118.638 121.732 118.638C121.212 118.638 120.962 119.001 120.962 119.721V121.185ZM123.562 121.235C122.942 121.235 122.73 120.922 122.73 120.422V118.638H122.266V118.112H122.448C122.642 118.112 122.73 118.024 122.73 117.83V117.261H123.312V118.112H124.013V118.638H123.312V120.296C123.312 120.559 123.374 120.703 123.706 120.703C123.825 120.703 123.906 120.691 124.013 120.66V121.173C123.862 121.21 123.712 121.235 123.562 121.235Z" fill="#76847E"/>
+<path d="M73.1204 137.556H72.5132V133.174H74.1281C75.1046 133.174 75.6742 133.719 75.6742 134.601C75.6742 135.484 75.1046 136.028 74.1281 136.028H73.1204V137.556ZM73.1204 133.738V135.465H74.1156C74.7353 135.465 75.067 135.171 75.067 134.601C75.067 134.032 74.7353 133.738 74.1156 133.738H73.1204ZM77.3933 134.414C78.1882 134.414 78.6139 134.764 78.6139 135.653V137.556H78.0568V137.13C77.869 137.399 77.5811 137.625 77.0991 137.625C76.4794 137.625 76.0413 137.305 76.0413 136.761C76.0413 136.129 76.5733 135.803 77.362 135.803C77.5936 135.803 77.8002 135.822 78.0317 135.872V135.559C78.0317 135.096 77.7939 134.914 77.3808 134.914C76.9614 134.914 76.7486 135.096 76.7048 135.415H76.1164C76.1665 134.77 76.6923 134.414 77.3933 134.414ZM77.2118 137.136C77.6499 137.136 78.0317 136.817 78.0317 136.373V136.323C77.8127 136.266 77.6249 136.241 77.3808 136.241C76.9113 136.241 76.6297 136.391 76.6297 136.711C76.6297 136.98 76.8112 137.136 77.2118 137.136ZM79.6121 138.977C79.4619 138.977 79.3367 138.964 79.224 138.933L79.2616 138.426C79.3617 138.457 79.4494 138.47 79.537 138.47C79.7748 138.47 79.8938 138.388 80.0002 138.088L80.2067 137.506L79.0425 134.482H79.6559L80.5134 136.811L81.3146 134.482H81.9093L80.526 138.213C80.3131 138.782 80.0878 138.977 79.6121 138.977ZM85.7697 134.414C86.477 134.414 86.8337 134.814 86.8337 135.678V137.556H86.2516V135.715C86.2516 135.177 86.0826 134.946 85.6632 134.946C85.1312 134.946 84.9121 135.321 84.9121 135.972V137.556H84.33V135.715C84.33 135.177 84.1548 134.946 83.7417 134.946C83.2034 134.946 82.9905 135.321 82.9905 135.972V137.556H82.4084V134.482H82.9655V134.883C83.2034 134.551 83.46 134.414 83.8668 134.414C84.2987 134.414 84.6054 134.583 84.7744 134.958C84.9872 134.595 85.3315 134.414 85.7697 134.414ZM90.3175 135.922V136.129H88.108C88.1393 136.792 88.4898 137.111 88.9781 137.111C89.3599 137.111 89.5727 136.974 89.7041 136.661H90.305C90.0797 137.349 89.5539 137.625 88.9781 137.625C88.1143 137.625 87.5134 136.992 87.5134 136.016C87.5134 134.952 88.1581 134.414 88.9593 134.414C89.7918 134.414 90.3175 135.046 90.3175 135.922ZM88.1268 135.69H89.7104C89.6728 135.165 89.4037 134.914 88.9593 134.914C88.5149 134.914 88.2082 135.158 88.1268 135.69ZM91.6093 137.556H91.0271V134.482H91.5842V134.883C91.8221 134.551 92.0975 134.414 92.5231 134.414C93.2367 134.414 93.5934 134.814 93.5934 135.678V137.556H93.0113V135.728C93.0113 135.177 92.8298 134.946 92.3917 134.946C91.8346 134.946 91.6093 135.321 91.6093 135.947V137.556ZM95.4381 137.606C94.8184 137.606 94.6056 137.293 94.6056 136.792V135.008H94.1424V134.482H94.324C94.518 134.482 94.6056 134.395 94.6056 134.201V133.631H95.1877V134.482H95.8888V135.008H95.1877V136.667C95.1877 136.93 95.2503 137.074 95.5821 137.074C95.701 137.074 95.7824 137.061 95.8888 137.03V137.543C95.7386 137.581 95.5883 137.606 95.4381 137.606ZM97.5618 137.625C96.8044 137.625 96.3475 137.28 96.2599 136.636H96.8545C96.9234 136.992 97.1675 137.136 97.5743 137.136C98.0125 137.136 98.2503 137.024 98.2503 136.729C98.2503 136.498 98.0938 136.379 97.6682 136.279L97.3991 136.216C96.6542 136.041 96.36 135.772 96.36 135.302C96.36 134.733 96.7982 134.414 97.5243 134.414C98.2691 134.414 98.7198 134.745 98.7824 135.359H98.1877C98.1377 135.027 97.9123 134.902 97.5368 134.902C97.155 134.902 96.9421 135.002 96.9421 135.271C96.9421 135.49 97.0861 135.609 97.493 135.703L97.7684 135.766C98.5132 135.935 98.8324 136.204 98.8324 136.692C98.8324 137.287 98.3567 137.625 97.5618 137.625Z" fill="#76847E"/>
+<path d="M145.667 54.6666V410.963H146.63V54.6666H145.667Z" fill="#EBE6DF" mask="url(#path-70-inside-2_1626_5832)"/>
+<rect width="393.852" height="356.296" transform="translate(146.148 54.6666)" fill="#FAF8F5"/>
+<rect x="155.778" y="64.2963" width="374.593" height="139.037" rx="7.7037" fill="white"/>
+<path d="M168.493 81.9259H167.347V79.7323L165.326 76.1963H166.627L167.953 78.5536L169.312 76.1963H170.572L168.493 79.7323V81.9259ZM172.007 82.0241C170.788 82.0241 169.986 81.1974 169.986 79.9042C169.986 78.6273 170.788 77.8006 172.007 77.8006C173.235 77.8006 174.029 78.6273 174.029 79.9042C174.029 81.1974 173.235 82.0241 172.007 82.0241ZM172.007 81.0992C172.58 81.0992 172.924 80.6654 172.924 79.9042C172.924 79.1429 172.58 78.7173 172.007 78.7173C171.426 78.7173 171.082 79.1429 171.082 79.9042C171.082 80.6654 171.426 81.0992 172.007 81.0992ZM176.187 82.0078C175.213 82.0078 174.722 81.4921 174.722 80.2725V77.8906H175.819V80.1906C175.819 80.8536 176.048 81.0746 176.498 81.0746C176.973 81.0746 177.251 80.7309 177.251 80.0761V77.8906H178.356V81.9259H177.317V81.4184C177.047 81.8195 176.67 82.0078 176.187 82.0078ZM180.456 81.9259H179.351V77.8906H180.391V78.4799C180.628 78.0134 180.989 77.8415 181.365 77.8415C181.463 77.8415 181.602 77.8497 181.692 77.8742V78.8974C181.521 78.8728 181.422 78.8646 181.283 78.8646C180.759 78.8646 180.456 79.2084 180.456 79.9451V81.9259ZM185.623 81.9259H184.478V76.1963H186.769C188.038 76.1963 188.873 76.9166 188.873 78.1443C188.873 79.3721 188.038 80.1006 186.769 80.1006H185.623V81.9259ZM185.623 77.244V79.0529H186.786C187.383 79.0529 187.727 78.7091 187.727 78.1443C187.727 77.5878 187.383 77.244 186.786 77.244H185.623ZM190.696 81.9259H189.591V77.8906H190.63V78.4799C190.868 78.0134 191.228 77.8415 191.605 77.8415C191.703 77.8415 191.842 77.8497 191.932 77.8742V78.8974C191.76 78.8728 191.662 78.8646 191.523 78.8646C190.999 78.8646 190.696 79.2084 190.696 79.9451V81.9259ZM194.277 82.0241C193.057 82.0241 192.255 81.1974 192.255 79.9042C192.255 78.6273 193.057 77.8006 194.277 77.8006C195.504 77.8006 196.298 78.6273 196.298 79.9042C196.298 81.1974 195.504 82.0241 194.277 82.0241ZM194.277 81.0992C194.85 81.0992 195.193 80.6654 195.193 79.9042C195.193 79.1429 194.85 78.7173 194.277 78.7173C193.696 78.7173 193.352 79.1429 193.352 79.9042C193.352 80.6654 193.696 81.0992 194.277 81.0992ZM198.285 81.9259H197.188V78.8073H196.623V77.8906H197.188V77.2603C197.188 76.4909 197.712 76.0981 198.473 76.0981C198.702 76.0981 198.907 76.1308 199.112 76.1881V77.0966C198.989 77.0557 198.874 77.0393 198.751 77.0393C198.457 77.0393 198.285 77.1294 198.285 77.4813V77.8906H199.071V78.8073H198.285V81.9259ZM200.195 77.2767C199.851 77.2767 199.598 77.0148 199.598 76.6874C199.598 76.36 199.851 76.1062 200.195 76.1062C200.539 76.1062 200.793 76.36 200.793 76.6874C200.793 77.0148 200.539 77.2767 200.195 77.2767ZM200.744 81.9259H199.639V77.8906H200.744V81.9259ZM202.895 81.975C202.093 81.975 201.741 81.6149 201.741 80.8864V76.1963H202.846V80.6326C202.846 80.9191 202.92 81.0501 203.181 81.0501C203.222 81.0501 203.271 81.0501 203.321 81.0419V81.9259C203.214 81.9505 203.083 81.975 202.895 81.975ZM207.655 79.9287V80.1333H204.823C204.888 80.8291 205.249 81.1319 205.74 81.1319C206.223 81.1319 206.435 80.9191 206.534 80.6326H207.655C207.352 81.7131 206.501 82.0241 205.74 82.0241C204.504 82.0241 203.693 81.1974 203.693 79.9042C203.693 78.3899 204.7 77.8006 205.699 77.8006C206.959 77.8006 207.655 78.7091 207.655 79.9287ZM204.848 79.454H206.493C206.444 78.8974 206.157 78.6436 205.699 78.6436C205.29 78.6436 204.954 78.8646 204.848 79.454Z" fill="#002E22"/>
+<g clip-path="url(#clip6_1626_5832)">
+<path d="M232.815 103.185H175.037V160.963H232.815V103.185Z" fill="#03D47C"/>
+<path d="M187.459 128.391C187.459 128.391 186.304 131.207 184.354 131.424C184.354 131.424 187.026 132.58 187.242 134.313C187.242 134.313 188.326 131.785 190.42 131.496C190.42 131.496 187.604 130.846 187.459 128.391Z" fill="#008C59"/>
+<path d="M221.404 134.818C221.404 134.818 220.248 137.635 218.298 137.852C218.298 137.852 220.97 139.007 221.187 140.741C221.187 140.741 222.27 138.213 224.365 137.924C224.437 137.924 221.548 137.274 221.404 134.818Z" fill="#008C59"/>
+<path d="M203.854 155.474C190.854 155.474 180.237 144.857 180.237 131.857C180.237 118.857 190.854 108.241 203.854 108.241C216.854 108.241 227.47 118.857 227.47 131.857C227.47 144.93 216.854 155.474 203.854 155.474ZM203.854 108.963C191.215 108.963 180.959 119.291 180.959 131.857C180.959 144.424 191.215 154.752 203.854 154.752C216.493 154.752 226.748 144.496 226.748 131.857C226.748 119.219 216.493 108.963 203.854 108.963Z" fill="#002140"/>
+<path d="M221.331 141.463C221.187 141.463 221.043 141.318 220.97 141.174C220.393 139.08 220.031 138.718 217.937 138.141C217.793 138.068 217.648 137.924 217.648 137.78C217.648 137.635 217.793 137.491 217.937 137.418C220.031 136.841 220.393 136.48 220.97 134.385C221.043 134.241 221.187 134.096 221.331 134.096C221.476 134.096 221.62 134.241 221.693 134.385C222.27 136.48 222.631 136.841 224.726 137.418C224.87 137.491 225.015 137.635 225.015 137.78C225.015 137.924 224.87 138.068 224.726 138.141C222.631 138.718 222.27 139.08 221.693 141.174C221.62 141.391 221.476 141.463 221.331 141.463ZM219.237 137.852C220.32 138.285 220.898 138.791 221.331 139.946C221.765 138.863 222.27 138.285 223.426 137.852C222.343 137.418 221.765 136.913 221.331 135.757C220.898 136.913 220.393 137.418 219.237 137.852Z" fill="#002140"/>
+<path d="M187.17 135.252C187.026 135.252 186.881 135.107 186.809 134.963C186.231 132.868 185.87 132.507 183.776 131.929C183.631 131.857 183.487 131.713 183.487 131.568C183.487 131.424 183.631 131.279 183.776 131.207C185.87 130.629 186.231 130.268 186.809 128.174C186.881 127.885 187.459 127.885 187.531 128.174C188.109 130.268 188.47 130.629 190.565 131.207C190.709 131.279 190.854 131.424 190.854 131.568C190.854 131.713 190.709 131.857 190.565 131.929C188.47 132.507 188.109 132.868 187.531 134.963C187.459 135.179 187.315 135.252 187.17 135.252ZM185.148 131.641C186.231 132.074 186.809 132.579 187.243 133.735C187.676 132.652 188.181 132.074 189.337 131.641C188.254 131.207 187.676 130.702 187.243 129.546C186.737 130.629 186.231 131.207 185.148 131.641Z" fill="#002140"/>
+<path d="M199.448 118.28L215.554 123.769C215.554 123.769 216.059 120.591 211.726 118.641L212.304 114.741C212.304 114.741 211.943 112.213 210.065 111.707C208.259 111.202 206.381 112.502 206.093 113.08C205.804 113.657 204.648 116.474 204.648 116.474C204.648 116.474 200.459 116.474 199.448 118.28Z" fill="#008C59"/>
+<path d="M215.554 124.13H215.481C215.265 124.057 215.193 123.841 215.265 123.696C215.843 121.746 212.809 119.002 208.548 117.702C204.576 116.474 200.676 116.835 199.737 118.496C199.665 118.641 199.448 118.713 199.231 118.641C199.087 118.568 199.015 118.352 199.087 118.135C200.17 116.113 204.359 115.607 208.693 116.98C213.459 118.496 216.565 121.53 215.843 123.841C215.843 123.985 215.698 124.13 215.554 124.13Z" fill="#002140"/>
+<path d="M211.726 119.002C211.726 119.002 211.654 119.002 211.726 119.002C211.509 119.002 211.365 118.785 211.365 118.569L211.87 115.174C212.015 113.657 211.076 112.285 209.631 111.924C208.259 111.563 206.743 112.357 206.237 113.73L205.226 116.402C205.154 116.619 204.937 116.691 204.793 116.619C204.576 116.546 204.504 116.33 204.576 116.185L205.587 113.513C206.237 111.78 208.043 110.769 209.848 111.202C211.654 111.635 212.809 113.369 212.593 115.246L212.087 118.641C212.015 118.857 211.87 119.002 211.726 119.002Z" fill="#002140"/>
+<path d="M196.704 146.374C196.704 146.374 197.065 147.313 197.931 147.313C198.798 147.313 200.026 147.385 200.026 147.385L200.82 148.035C200.82 148.035 201.47 150.202 203.131 149.985C204.865 149.768 204.504 148.18 204.72 148.468C206.237 148.613 206.237 148.107 206.454 146.952C206.454 146.952 207.826 146.735 207.97 145.652C207.97 145.652 210.281 146.446 213.387 144.93C216.42 143.413 215.915 141.102 215.843 140.163C215.77 139.224 214.615 136.913 214.181 136.624C213.748 136.335 212.665 135.396 212.665 135.396L197.209 130.846L201.976 141.68C201.976 141.535 195.043 142.041 196.704 146.374Z" fill="#03D47C"/>
+<path d="M188.47 124.274C188.47 124.274 188.326 127.813 194.176 129.691C200.098 131.569 211.87 134.963 211.87 134.963C211.87 134.963 220.465 136.841 221.765 132.291C222.993 127.741 220.754 126.513 219.093 125.502C219.093 125.502 211.509 121.313 203.637 119.508C195.693 117.63 191.648 117.413 189.481 120.952C189.048 122.252 188.47 123.769 188.47 124.274Z" fill="#008C59"/>
+<path d="M200.17 128.824C202.048 128.824 203.565 127.307 203.565 125.43C203.565 123.552 202.048 122.035 200.17 122.035C198.293 122.035 196.776 123.552 196.776 125.43C196.776 127.307 198.293 128.824 200.17 128.824Z" fill="#8EECC4"/>
+<path d="M207.032 131.135C208.909 131.135 210.426 129.618 210.426 127.741C210.426 125.863 208.909 124.346 207.032 124.346C205.154 124.346 203.637 125.863 203.637 127.741C203.637 129.618 205.154 131.135 207.032 131.135Z" fill="#8EECC4"/>
+<path d="M198.22 133.591L196.92 130.774L186.809 142.113C186.809 142.113 186.52 144.063 186.954 144.858C187.315 145.652 189.12 146.374 189.12 146.374L196.704 146.302C196.704 146.302 195.981 143.919 197.281 143.052L190.709 142.98L190.204 142.763L198.22 133.591Z" fill="#002140"/>
+<path d="M195.62 118.063C195.62 118.063 192.443 118.424 191.359 119.146C191.359 119.146 191.432 123.046 194.537 122.107C197.715 121.169 196.054 118.135 195.62 118.063Z" fill="#002140"/>
+<path d="M192.298 123.696C192.298 123.696 189.77 123.696 189.265 126.152C189.265 126.152 190.781 128.174 191.793 128.607C191.793 128.607 193.887 128.535 194.176 126.729C194.465 124.924 193.165 123.696 192.298 123.696Z" fill="#002140"/>
+<path d="M207.537 120.735C207.537 120.735 203.565 119.291 202.915 119.291C202.265 119.363 202.337 122.252 204.576 122.757C206.815 123.335 207.537 120.735 207.537 120.735Z" fill="#002140"/>
+<path d="M217.504 124.852L213.893 123.119C213.893 123.119 212.737 124.13 212.665 124.78C212.593 125.43 212.881 127.669 214.543 127.813C216.204 128.03 217.576 126.657 217.504 124.852Z" fill="#002140"/>
+<path d="M220.97 127.38C220.97 127.38 219.526 127.741 219.67 129.402C219.815 131.063 221.981 131.352 221.981 131.352C221.981 131.352 223.065 128.246 220.97 127.38Z" fill="#002140"/>
+<path d="M214.254 135.324L216.781 135.541C216.781 135.541 218.443 134.241 218.081 133.013C217.72 131.785 216.781 130.774 215.193 130.918C213.604 131.063 213.315 132.58 213.243 132.941C212.954 134.024 213.965 135.252 214.254 135.324Z" fill="#002140"/>
+<path d="M215.915 135.974C213.893 135.974 211.798 135.396 210.354 134.963C205.804 133.663 201.182 132.219 196.704 130.846L195.332 130.413C191.648 129.257 189.482 127.813 188.543 125.935C187.965 124.707 187.965 123.335 188.615 121.891C191.432 115.174 200.82 118.135 206.454 119.941C207.104 120.157 207.754 120.374 208.332 120.519C211.004 121.313 213.82 122.469 216.782 123.985L217.07 124.13C219.309 125.285 222.632 126.946 222.632 130.052C222.632 130.846 222.415 131.713 221.909 132.58C220.537 135.252 218.226 135.974 215.915 135.974ZM195.909 118.496C193.02 118.496 190.493 119.435 189.337 122.252C188.832 123.552 188.759 124.707 189.265 125.719C190.059 127.38 192.154 128.752 195.62 129.835L196.993 130.269C201.47 131.641 206.02 133.085 210.57 134.385C214.976 135.613 219.309 136.191 221.332 132.363C221.765 131.569 221.982 130.846 221.982 130.124C221.982 127.524 219.02 126.007 216.782 124.852L216.493 124.707C213.604 123.191 210.787 122.107 208.187 121.313C207.609 121.169 206.959 120.952 206.237 120.735C203.276 119.724 199.304 118.496 195.909 118.496Z" fill="#002140"/>
+<path d="M200.026 129.402C197.859 129.402 196.126 127.669 196.126 125.574C196.126 123.48 197.859 121.746 200.026 121.746C202.193 121.746 203.926 123.48 203.926 125.574C203.926 127.669 202.193 129.402 200.026 129.402ZM200.026 122.469C198.293 122.469 196.848 123.841 196.848 125.574C196.848 127.308 198.293 128.68 200.026 128.68C201.759 128.68 203.204 127.308 203.204 125.574C203.204 123.841 201.759 122.469 200.026 122.469Z" fill="#002140"/>
+<path d="M200.459 125.718L202.626 125.863C202.698 124.635 201.976 123.48 200.82 123.335C199.665 123.118 198.509 124.13 198.293 125.502C198.076 126.874 198.87 128.174 200.026 128.391C200.748 128.535 201.398 128.246 201.904 127.668L200.459 125.718Z" fill="#002140"/>
+<path d="M207.032 127.669L209.198 127.813C209.27 126.585 208.548 125.43 207.393 125.285C206.237 125.069 205.082 126.08 204.865 127.452C204.648 128.824 205.443 130.124 206.598 130.341C207.32 130.485 207.97 130.196 208.476 129.619L207.032 127.669Z" fill="#002140"/>
+<path d="M206.959 131.641C204.793 131.641 203.059 129.907 203.059 127.813C203.059 125.718 204.793 123.985 206.959 123.985C209.126 123.985 210.859 125.718 210.859 127.813C210.859 129.907 209.126 131.641 206.959 131.641ZM206.959 124.635C205.226 124.635 203.781 126.007 203.781 127.741C203.781 129.474 205.226 130.846 206.959 130.846C208.693 130.846 210.137 129.474 210.137 127.741C210.137 126.007 208.693 124.635 206.959 124.635Z" fill="#002140"/>
+<path d="M201.904 141.824C201.759 141.824 201.615 141.752 201.543 141.608L196.632 130.774C196.559 130.558 196.632 130.413 196.776 130.269C196.993 130.196 197.137 130.269 197.282 130.413L202.193 141.246C202.265 141.463 202.193 141.608 202.048 141.752C201.976 141.824 201.976 141.824 201.904 141.824Z" fill="#002140"/>
+<path d="M209.776 146.23C208.548 146.23 207.97 145.941 207.97 145.941C207.754 145.869 207.681 145.652 207.826 145.435C207.898 145.291 208.115 145.146 208.331 145.291C208.331 145.291 208.909 145.507 210.137 145.507C211.293 145.435 215.698 144.569 215.698 140.957C215.698 137.419 212.52 135.541 212.52 135.541C212.376 135.469 212.304 135.252 212.376 135.035C212.448 134.891 212.665 134.819 212.881 134.891C213.026 134.963 216.42 136.913 216.42 140.885C216.42 145.074 211.437 146.085 210.137 146.157C209.993 146.23 209.92 146.23 209.776 146.23Z" fill="#002140"/>
+<path d="M205.009 148.83C204.937 148.83 204.865 148.83 204.865 148.83C204.648 148.83 204.504 148.613 204.504 148.469C204.504 148.252 204.72 148.107 204.865 148.107C204.865 148.107 205.659 148.18 206.02 147.674C206.165 147.53 206.237 147.169 206.093 146.735C206.02 146.302 205.587 145.291 203.926 144.496C203.781 144.424 203.709 144.207 203.781 143.991C203.854 143.846 204.07 143.774 204.287 143.846C206.165 144.785 206.67 145.941 206.815 146.591C206.959 147.169 206.887 147.746 206.598 148.107C206.165 148.757 205.37 148.83 205.009 148.83Z" fill="#002140"/>
+<path d="M203.204 150.491C202.048 150.491 201.398 149.335 200.965 148.541C200.893 148.396 200.82 148.252 200.748 148.107C200.459 147.674 200.243 147.674 198.654 147.746H198.365C196.704 147.818 196.126 146.085 196.126 145.146C196.126 144.352 196.415 143.63 196.993 143.052C198.076 141.968 199.954 141.391 202.193 141.391C203.709 141.391 205.804 142.402 205.948 142.474C207.826 143.413 208.331 144.568 208.476 145.218C208.62 145.796 208.548 146.374 208.259 146.735C207.898 147.241 207.248 147.457 206.887 147.457C206.67 147.457 206.526 147.313 206.526 147.168C206.526 146.952 206.67 146.807 206.815 146.807C207.104 146.807 207.465 146.663 207.681 146.374C207.826 146.23 207.898 145.868 207.754 145.435C207.681 145.002 207.248 143.991 205.587 143.196C205.587 143.196 203.493 142.185 202.193 142.185C200.098 142.185 198.437 142.691 197.498 143.63C197.065 144.135 196.776 144.641 196.848 145.218C196.848 145.291 196.92 147.168 198.365 147.096H198.654C200.243 147.024 200.893 147.024 201.398 147.818C201.47 147.963 201.543 148.107 201.687 148.324C202.048 148.974 202.554 149.913 203.276 149.913C204.143 149.913 204.504 149.552 204.504 148.757C204.504 148.107 203.276 146.663 201.904 145.941C201.759 145.868 201.687 145.652 201.759 145.435C201.831 145.291 202.048 145.218 202.265 145.291C203.637 146.013 205.226 147.674 205.226 148.757C205.154 149.841 204.504 150.491 203.204 150.491Z" fill="#002140"/>
+<path d="M197.137 143.485H190.781C190.492 143.485 190.276 143.341 190.204 143.124C190.059 142.907 190.131 142.619 190.276 142.402L197.931 133.519C198.076 133.374 198.292 133.374 198.437 133.446C198.581 133.591 198.581 133.807 198.509 133.952L190.926 142.763H197.137C197.354 142.763 197.498 142.907 197.498 143.124C197.498 143.341 197.354 143.485 197.137 143.485Z" fill="#002140"/>
+<path d="M196.631 146.88H189.481C188.181 146.88 187.098 146.157 186.52 145.002C186.015 143.846 186.231 142.474 187.026 141.535L196.776 130.557C196.92 130.413 197.137 130.413 197.281 130.557C197.426 130.702 197.426 130.919 197.281 131.063L187.604 141.969C186.954 142.691 186.809 143.774 187.17 144.641C187.604 145.58 188.47 146.085 189.481 146.085H196.704C196.92 146.085 197.065 146.23 197.065 146.446C197.065 146.663 196.848 146.88 196.631 146.88Z" fill="#002140"/>
+<path d="M216.854 135.83C216.709 135.83 216.637 135.758 216.565 135.685C216.493 135.541 216.493 135.324 216.709 135.18C217.359 134.819 217.72 134.169 217.72 133.446C217.72 132.291 216.781 131.424 215.698 131.424C214.543 131.424 213.676 132.363 213.676 133.446C213.676 134.096 213.965 134.674 214.47 135.108C214.615 135.252 214.687 135.469 214.543 135.613C214.398 135.758 214.181 135.83 214.037 135.685C213.315 135.18 212.954 134.385 212.954 133.519C212.954 132.002 214.181 130.774 215.698 130.774C217.215 130.774 218.443 132.002 218.443 133.519C218.443 134.53 217.937 135.396 217.143 135.902C216.998 135.83 216.926 135.83 216.854 135.83Z" fill="#002140"/>
+<path d="M221.693 131.713C220.32 131.713 219.237 130.63 219.237 129.257C219.237 128.174 219.887 127.235 220.97 126.946C221.187 126.874 221.331 127.019 221.404 127.163C221.476 127.38 221.331 127.524 221.187 127.596C220.465 127.813 219.959 128.463 219.959 129.257C219.959 130.196 220.754 130.991 221.693 130.991C221.765 130.991 221.837 130.991 221.909 130.991C222.126 130.991 222.27 131.063 222.343 131.28C222.415 131.496 222.27 131.641 222.054 131.713C221.909 131.713 221.837 131.713 221.693 131.713Z" fill="#002140"/>
+<path d="M214.976 128.246C213.387 128.246 212.159 126.946 212.159 125.43C212.159 124.346 212.809 123.335 213.748 122.902C213.892 122.83 214.109 122.902 214.254 123.046C214.326 123.191 214.254 123.407 214.109 123.552C213.387 123.913 212.954 124.635 212.954 125.43C212.954 126.585 213.892 127.524 215.048 127.524C216.204 127.524 217.142 126.585 217.142 125.43C217.142 125.285 217.142 125.141 217.07 124.996C216.998 124.78 217.142 124.635 217.359 124.563C217.576 124.491 217.72 124.635 217.792 124.852C217.865 125.069 217.865 125.213 217.865 125.43C217.792 126.946 216.565 128.246 214.976 128.246Z" fill="#002140"/>
+<path d="M192.009 128.968C191.793 128.968 191.648 128.824 191.648 128.607C191.648 128.391 191.793 128.246 192.009 128.246C193.093 128.174 193.887 127.235 193.887 126.152C193.887 124.996 192.948 124.057 191.793 124.057C190.637 124.057 189.698 124.996 189.698 126.152C189.698 126.224 189.698 126.368 189.698 126.441C189.698 126.657 189.554 126.802 189.409 126.874C189.193 126.874 189.048 126.73 188.976 126.585C188.976 126.441 188.976 126.296 188.976 126.152C188.976 124.563 190.276 123.335 191.793 123.335C193.309 123.335 194.609 124.635 194.609 126.152C194.609 127.668 193.526 128.824 192.009 128.968Z" fill="#002140"/>
+<path d="M193.815 122.541C192.226 122.541 190.926 121.241 190.926 119.652C190.926 119.507 190.926 119.291 190.998 119.146C190.998 118.93 191.215 118.785 191.431 118.857C191.648 118.857 191.793 119.074 191.72 119.291C191.72 119.435 191.72 119.507 191.72 119.652C191.72 120.807 192.659 121.818 193.887 121.818C195.115 121.818 196.054 120.88 196.054 119.652C196.054 119.218 195.909 118.713 195.62 118.352C195.476 118.207 195.548 117.991 195.693 117.846C195.837 117.702 196.054 117.774 196.198 117.918C196.559 118.424 196.776 119.002 196.776 119.652C196.704 121.241 195.404 122.541 193.815 122.541Z" fill="#002140"/>
+<path d="M205.154 123.191C203.565 123.191 202.265 121.891 202.265 120.302C202.265 119.941 202.337 119.579 202.481 119.218C202.554 119.002 202.77 118.929 202.987 119.002C203.204 119.074 203.276 119.291 203.204 119.507C203.131 119.796 203.059 120.013 203.059 120.302C203.059 121.457 203.998 122.468 205.226 122.468C206.237 122.468 207.104 121.746 207.32 120.735C207.393 120.518 207.537 120.374 207.754 120.446C207.97 120.518 208.043 120.663 208.043 120.879C207.681 122.252 206.526 123.191 205.154 123.191Z" fill="#002140"/>
+<path d="M205.804 135.035L204.07 137.13C204.07 137.13 203.709 137.78 204.07 138.069C204.431 138.358 204.937 138.358 205.226 138.069C205.515 137.78 206.743 135.974 206.743 135.974L205.804 135.035Z" fill="#8EECC4"/>
+<path d="M207.682 136.191L205.948 138.285C205.948 138.285 205.587 138.935 205.948 139.224C206.309 139.513 206.815 139.513 207.104 139.224C207.393 138.935 208.62 137.13 208.62 137.13L207.682 136.191Z" fill="#8EECC4"/>
+<path d="M207.32 139.152C207.32 139.152 207.176 139.802 206.382 139.513C205.587 139.152 205.659 138.213 205.659 138.213C205.659 138.213 204.215 139.008 204.07 138.069C203.926 137.13 203.637 137.274 204.215 136.624C204.865 135.974 205.587 134.819 205.587 134.819C205.587 134.819 204.143 133.735 203.42 133.952C202.698 134.169 201.615 135.18 201.615 135.469C201.615 135.758 201.47 139.224 205.876 140.524C210.282 141.824 210.859 140.38 211.148 139.658C211.437 139.008 212.015 138.285 210.932 137.78C209.848 137.274 208.909 136.985 208.909 136.985L207.32 139.152Z" fill="#002140"/>
+<path d="M203.854 137.274L205.659 134.891C205.659 134.891 203.42 133.085 202.048 134.819C200.676 136.552 202.915 138.935 202.915 138.935C202.915 138.935 205.948 141.174 208.259 141.246C210.57 141.319 211.293 139.513 211.293 139.513L211.148 138.213L208.909 136.913L206.887 139.585C206.887 139.585 206.309 139.513 205.948 139.441C205.587 139.296 205.731 138.069 205.731 138.069C205.731 138.069 204.431 138.574 204.143 138.285C203.854 138.069 203.854 137.274 203.854 137.274Z" fill="#002140"/>
+<path d="M208.62 141.607C207.176 141.607 205.587 140.957 204.792 140.596C201.759 139.152 201.326 137.13 201.254 136.841C201.254 136.841 201.254 136.841 201.254 136.768C201.109 135.468 201.542 134.457 202.481 133.952C203.854 133.302 205.37 134.024 206.309 134.963C206.742 135.396 207.393 135.83 208.187 136.191C208.476 136.335 208.692 136.407 208.981 136.552C209.631 136.841 210.354 137.13 210.931 137.563C211.365 137.852 211.581 138.285 211.654 138.863C211.654 139.585 211.293 140.452 210.715 140.957C210.137 141.463 209.415 141.607 208.62 141.607ZM201.976 136.624C201.976 136.696 202.265 138.502 205.081 139.874C205.948 140.307 208.837 141.535 210.281 140.307C210.715 139.946 211.004 139.296 211.004 138.791C211.004 138.502 210.859 138.213 210.642 138.068C210.065 137.707 209.487 137.418 208.837 137.13C208.548 136.985 208.259 136.913 208.042 136.768C207.176 136.335 206.454 135.902 205.948 135.396C205.154 134.602 203.926 134.024 202.915 134.53C201.904 135.035 201.904 136.191 201.976 136.624Z" fill="#002140"/>
+<path d="M204.576 138.863C204.215 138.863 203.998 138.718 203.926 138.646C203.781 138.574 203.492 138.285 203.42 137.852C203.348 137.491 203.492 137.13 203.854 136.696C204.504 135.83 205.226 134.818 205.226 134.818C205.37 134.674 205.587 134.602 205.731 134.746C205.876 134.891 205.948 135.107 205.804 135.252C205.804 135.324 205.081 136.335 204.359 137.202C204.142 137.418 204.07 137.635 204.07 137.852C204.07 137.996 204.215 138.068 204.287 138.141C204.287 138.141 204.431 138.213 204.576 138.213C204.792 138.141 205.081 137.996 205.298 137.635L206.526 135.974C206.67 135.83 206.887 135.757 207.031 135.902C207.176 136.046 207.248 136.263 207.104 136.407L205.876 138.068C205.515 138.574 205.081 138.863 204.648 138.935C204.72 138.791 204.648 138.863 204.576 138.863Z" fill="#002140"/>
+<path d="M206.454 140.019C206.093 140.019 205.876 139.874 205.804 139.802C205.659 139.73 205.37 139.441 205.298 139.007C205.226 138.646 205.37 138.285 205.731 137.852C206.093 137.419 206.526 136.769 207.031 136.119C207.176 135.974 207.393 135.902 207.537 136.046C207.681 136.191 207.754 136.407 207.609 136.552C207.104 137.274 206.67 137.852 206.309 138.357C206.093 138.574 206.02 138.791 206.02 139.007C206.02 139.152 206.165 139.224 206.237 139.296C206.237 139.296 206.381 139.369 206.526 139.369C206.743 139.296 207.031 139.152 207.248 138.791L208.476 137.13C208.62 136.985 208.837 136.913 208.981 137.057C209.126 137.202 209.198 137.419 209.054 137.563L207.826 139.224C207.465 139.73 207.031 140.019 206.598 140.091C206.598 140.019 206.526 140.019 206.454 140.019Z" fill="#002140"/>
+</g>
+<rect x="182.278" y="170.593" width="43.2963" height="13.4815" rx="6.74074" fill="#EEEBE7"/>
+<path d="M191.18 178.833H188.442V175.126H191.122V175.814H189.184V176.593H190.868V177.281H189.184V178.145H191.18V178.833ZM192.597 178.897C191.887 178.897 191.432 178.362 191.432 177.525C191.432 176.699 191.908 176.164 192.597 176.164C192.899 176.164 193.126 176.265 193.312 176.466V175.126H194.022V178.833H193.354V178.531C193.142 178.775 192.904 178.897 192.597 178.897ZM192.735 178.298C193.111 178.298 193.333 178.023 193.333 177.525C193.333 177.033 193.111 176.757 192.735 176.757C192.364 176.757 192.141 177.033 192.141 177.525C192.141 178.023 192.364 178.298 192.735 178.298ZM195.033 175.825C194.811 175.825 194.647 175.655 194.647 175.444C194.647 175.232 194.811 175.068 195.033 175.068C195.256 175.068 195.42 175.232 195.42 175.444C195.42 175.655 195.256 175.825 195.033 175.825ZM195.388 178.833H194.673V176.222H195.388V178.833ZM196.928 178.886C196.356 178.886 196.129 178.579 196.129 178.155V176.815H195.763V176.222H195.912C196.07 176.222 196.15 176.143 196.15 175.984V175.512H196.844V176.222H197.384V176.815H196.844V177.986C196.844 178.182 196.902 178.277 197.114 178.277C197.225 178.277 197.294 178.256 197.384 178.229V178.817C197.246 178.86 197.066 178.886 196.928 178.886ZM199.973 178.833H199.231V175.126H200.714C201.535 175.126 202.075 175.592 202.075 176.386C202.075 177.181 201.535 177.652 200.714 177.652H199.973V178.833ZM199.973 175.804V176.974H200.725C201.111 176.974 201.334 176.752 201.334 176.386C201.334 176.026 201.111 175.804 200.725 175.804H199.973ZM203.271 178.833H202.556V175.126H203.271V176.524C203.44 176.275 203.684 176.164 203.991 176.164C204.616 176.164 204.934 176.492 204.934 177.281V178.833H204.224V177.34C204.224 176.916 204.076 176.773 203.779 176.773C203.451 176.773 203.271 176.995 203.271 177.414V178.833ZM206.699 178.897C205.91 178.897 205.391 178.362 205.391 177.525C205.391 176.699 205.91 176.164 206.699 176.164C207.494 176.164 208.008 176.699 208.008 177.525C208.008 178.362 207.494 178.897 206.699 178.897ZM206.699 178.298C207.07 178.298 207.293 178.018 207.293 177.525C207.293 177.033 207.07 176.757 206.699 176.757C206.323 176.757 206.101 177.033 206.101 177.525C206.101 178.018 206.323 178.298 206.699 178.298ZM209.383 178.886C208.811 178.886 208.583 178.579 208.583 178.155V176.815H208.218V176.222H208.366C208.525 176.222 208.604 176.143 208.604 175.984V175.512H209.298V176.222H209.839V176.815H209.298V177.986C209.298 178.182 209.357 178.277 209.568 178.277C209.68 178.277 209.748 178.256 209.839 178.229V178.817C209.701 178.86 209.521 178.886 209.383 178.886ZM211.401 178.897C210.612 178.897 210.093 178.362 210.093 177.525C210.093 176.699 210.612 176.164 211.401 176.164C212.195 176.164 212.709 176.699 212.709 177.525C212.709 178.362 212.195 178.897 211.401 178.897ZM211.401 178.298C211.772 178.298 211.994 178.018 211.994 177.525C211.994 177.033 211.772 176.757 211.401 176.757C211.025 176.757 210.803 177.033 210.803 177.525C210.803 178.018 211.025 178.298 211.401 178.298Z" fill="#002E22"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M215.44 176.058C215.214 176.284 215.214 176.65 215.44 176.875L217.87 179.306L220.301 176.875C220.527 176.65 220.527 176.284 220.301 176.058C220.075 175.833 219.71 175.833 219.484 176.058L217.87 177.672L216.257 176.058C216.031 175.833 215.665 175.833 215.44 176.058Z" fill="#A2A9A3"/>
+<rect x="252.315" y="103.426" width="126.63" height="20.7037" rx="3.61111" fill="white"/>
+<path d="M260.25 115.963H259.549V111.557H257.996V110.907H261.802V111.557H260.25V115.963ZM263.174 116.042C262.163 116.042 261.491 115.313 261.491 114.186C261.491 113.067 262.163 112.337 263.174 112.337C264.185 112.337 264.849 113.067 264.849 114.186C264.849 115.313 264.185 116.042 263.174 116.042ZM263.174 115.436C263.802 115.436 264.17 115.002 264.17 114.186C264.17 113.37 263.802 112.944 263.174 112.944C262.538 112.944 262.17 113.37 262.17 114.186C262.17 115.002 262.538 115.436 263.174 115.436ZM267.001 116.042C266.048 116.042 265.426 115.313 265.426 114.186C265.426 113.067 266.062 112.337 267.001 112.337C267.47 112.337 267.774 112.482 268.084 112.85V110.907H268.756V115.963H268.113V115.486C267.781 115.876 267.47 116.042 267.001 116.042ZM267.095 115.436C267.73 115.436 268.099 115.002 268.099 114.186C268.099 113.37 267.73 112.944 267.095 112.944C266.466 112.944 266.091 113.37 266.091 114.186C266.091 115.002 266.466 115.436 267.095 115.436ZM271.162 116.042C270.209 116.042 269.588 115.313 269.588 114.186C269.588 113.067 270.223 112.337 271.162 112.337C271.632 112.337 271.935 112.482 272.245 112.85V110.907H272.917V115.963H272.274V115.486C271.942 115.876 271.632 116.042 271.162 116.042ZM271.256 115.436C271.892 115.436 272.26 115.002 272.26 114.186C272.26 113.37 271.892 112.944 271.256 112.944C270.628 112.944 270.252 113.37 270.252 114.186C270.252 115.002 270.628 115.436 271.256 115.436Z" fill="black"/>
+<rect x="252.315" y="103.426" width="126.63" height="20.7037" rx="3.61111" stroke="#EBE6DF" stroke-width="0.481481"/>
+<rect x="252.315" y="132.315" width="126.63" height="20.7037" rx="3.61111" fill="white"/>
+<path d="M260.56 144.931C259.145 144.931 258.213 143.884 258.213 142.317C258.213 140.786 259.159 139.717 260.575 139.717C261.672 139.717 262.46 140.352 262.756 141.4H262.019C261.766 140.699 261.282 140.367 260.575 140.367C259.549 140.367 258.913 141.118 258.913 142.324C258.913 143.53 259.549 144.281 260.575 144.281C261.297 144.281 261.788 143.935 262.026 143.191H262.748C262.467 144.281 261.672 144.931 260.56 144.931ZM264.501 144.895C263.865 144.895 263.62 144.606 263.62 144.036V139.796H264.291V143.898C264.291 144.18 264.378 144.303 264.631 144.303C264.681 144.303 264.732 144.303 264.79 144.296V144.859C264.71 144.881 264.602 144.895 264.501 144.895ZM265.648 146.491C265.474 146.491 265.33 146.477 265.2 146.441L265.243 145.856C265.359 145.892 265.46 145.906 265.561 145.906C265.835 145.906 265.973 145.812 266.095 145.466L266.334 144.794L264.99 141.306H265.698L266.688 143.992L267.612 141.306H268.298L266.702 145.61C266.457 146.267 266.197 146.491 265.648 146.491ZM270.146 144.931C269.193 144.931 268.572 144.202 268.572 143.075C268.572 141.956 269.208 141.226 270.146 141.226C270.616 141.226 270.919 141.371 271.23 141.739V139.796H271.901V144.852H271.259V144.375C270.926 144.765 270.616 144.931 270.146 144.931ZM270.24 144.325C270.876 144.325 271.244 143.891 271.244 143.075C271.244 142.259 270.876 141.833 270.24 141.833C269.612 141.833 269.236 142.259 269.236 143.075C269.236 143.891 269.612 144.325 270.24 144.325ZM275.969 142.967V143.205H273.419C273.455 143.971 273.86 144.339 274.423 144.339C274.864 144.339 275.109 144.18 275.261 143.819H275.954C275.694 144.613 275.088 144.931 274.423 144.931C273.427 144.931 272.733 144.202 272.733 143.075C272.733 141.847 273.477 141.226 274.402 141.226C275.362 141.226 275.969 141.956 275.969 142.967ZM273.441 142.7H275.268C275.225 142.093 274.914 141.804 274.402 141.804C273.889 141.804 273.535 142.086 273.441 142.7Z" fill="black"/>
+<rect x="252.315" y="132.315" width="126.63" height="20.7037" rx="3.61111" stroke="#EBE6DF" stroke-width="0.481481"/>
+<rect x="252.074" y="160.963" width="36.4074" height="19.2593" rx="9.62963" fill="#03D47C"/>
+<path d="M261.975 172.668C260.829 172.668 260.185 172.004 260.185 170.834V168.211H261.061V170.803C261.061 171.535 261.386 171.854 261.968 171.854C262.551 171.854 262.876 171.535 262.876 170.803V168.211H263.752V170.834C263.752 172.004 263.114 172.668 261.975 172.668ZM265.387 173.926H264.542V169.507H265.337V169.864C265.575 169.576 265.869 169.438 266.232 169.438C267.071 169.438 267.609 170.07 267.609 171.047C267.609 172.036 267.046 172.668 266.226 172.668C265.869 172.668 265.588 172.536 265.387 172.305V173.926ZM266.063 171.96C266.508 171.96 266.771 171.635 266.771 171.047C266.771 170.458 266.508 170.139 266.063 170.139C265.625 170.139 265.362 170.458 265.362 171.047C265.362 171.635 265.625 171.96 266.063 171.96ZM269.375 172.668C268.536 172.668 267.998 172.036 267.998 171.047C267.998 170.07 268.561 169.438 269.375 169.438C269.731 169.438 270.001 169.557 270.22 169.795V168.211H271.058V172.593H270.27V172.236C270.019 172.524 269.738 172.668 269.375 172.668ZM269.537 171.96C269.982 171.96 270.245 171.635 270.245 171.047C270.245 170.465 269.982 170.139 269.537 170.139C269.099 170.139 268.836 170.465 268.836 171.047C268.836 171.635 269.099 171.96 269.537 171.96ZM273.143 169.438C274.063 169.438 274.464 169.82 274.464 170.734V172.593H273.669V172.192C273.487 172.461 273.187 172.668 272.749 172.668C272.085 172.668 271.672 172.33 271.672 171.773C271.672 171.141 272.21 170.803 273.036 170.803C273.274 170.803 273.45 170.821 273.625 170.859V170.615C273.625 170.233 273.456 170.07 273.112 170.07C272.78 170.07 272.605 170.245 272.586 170.49H271.747C271.81 169.776 272.392 169.438 273.143 169.438ZM272.98 172.029C273.318 172.029 273.625 171.791 273.625 171.416V171.378C273.468 171.335 273.331 171.316 273.112 171.316C272.736 171.316 272.511 171.435 272.511 171.691C272.511 171.904 272.655 172.029 272.98 172.029ZM276.248 172.655C275.572 172.655 275.303 172.292 275.303 171.791V170.208H274.871V169.507H275.046C275.234 169.507 275.328 169.413 275.328 169.225V168.668H276.148V169.507H276.786V170.208H276.148V171.591C276.148 171.823 276.217 171.935 276.467 171.935C276.599 171.935 276.68 171.91 276.786 171.879V172.574C276.624 172.624 276.411 172.655 276.248 172.655ZM280.116 171.065V171.222H277.951C278.001 171.754 278.276 171.986 278.652 171.986C279.021 171.986 279.184 171.823 279.259 171.604H280.116C279.885 172.43 279.234 172.668 278.652 172.668C277.707 172.668 277.087 172.036 277.087 171.047C277.087 169.889 277.857 169.438 278.62 169.438C279.584 169.438 280.116 170.133 280.116 171.065ZM277.97 170.702H279.228C279.19 170.277 278.971 170.083 278.62 170.083C278.308 170.083 278.051 170.252 277.97 170.702Z" fill="white"/>
+<rect x="155.778" y="222.593" width="374.593" height="60.4444" rx="7.7037" fill="white"/>
+<path d="M168.354 240.222H167.208V235.557H165.547V234.493H170.007V235.557H168.354V240.222ZM172.214 240.222H171.232L169.988 236.187H171.125L171.829 238.724L172.558 236.187H173.458L174.187 238.724L174.882 236.187H175.987L174.702 240.222H173.712L172.983 237.562L172.214 240.222ZM178.154 240.32C176.935 240.32 176.132 239.494 176.132 238.2C176.132 236.924 176.935 236.097 178.154 236.097C179.382 236.097 180.176 236.924 180.176 238.2C180.176 239.494 179.382 240.32 178.154 240.32ZM178.154 239.395C178.727 239.395 179.071 238.962 179.071 238.2C179.071 237.439 178.727 237.014 178.154 237.014C177.573 237.014 177.229 237.439 177.229 238.2C177.229 238.962 177.573 239.395 178.154 239.395ZM184.217 240.222H183.071V234.493H187.024V235.557H184.217V236.964H186.721V238.029H184.217V240.222ZM189.272 236.097C190.475 236.097 190.999 236.596 190.999 237.791V240.222H189.959V239.698C189.722 240.05 189.329 240.32 188.756 240.32C187.888 240.32 187.348 239.878 187.348 239.15C187.348 238.323 188.052 237.881 189.132 237.881C189.443 237.881 189.673 237.906 189.902 237.955V237.636C189.902 237.136 189.681 236.924 189.231 236.924C188.797 236.924 188.568 237.153 188.543 237.472H187.446C187.528 236.539 188.289 236.097 189.272 236.097ZM189.059 239.486C189.501 239.486 189.902 239.174 189.902 238.683V238.634C189.697 238.577 189.517 238.552 189.231 238.552C188.74 238.552 188.445 238.708 188.445 239.044C188.445 239.322 188.633 239.486 189.059 239.486ZM193.692 240.32C192.489 240.32 191.703 239.494 191.703 238.2C191.703 236.924 192.514 236.097 193.725 236.097C194.716 236.097 195.477 236.596 195.608 237.619H194.486C194.347 237.21 194.085 237.014 193.692 237.014C193.144 237.014 192.8 237.439 192.8 238.2C192.8 238.962 193.136 239.395 193.692 239.395C194.094 239.395 194.388 239.174 194.503 238.724H195.616C195.452 239.723 194.716 240.32 193.692 240.32ZM197.689 240.304C196.805 240.304 196.453 239.829 196.453 239.174V237.104H195.888V236.187H196.117C196.363 236.187 196.485 236.064 196.485 235.819V235.09H197.558V236.187H198.393V237.104H197.558V238.913C197.558 239.215 197.648 239.363 197.975 239.363C198.147 239.363 198.253 239.33 198.393 239.289V240.198C198.18 240.263 197.901 240.304 197.689 240.304ZM200.807 240.32C199.588 240.32 198.786 239.494 198.786 238.2C198.786 236.924 199.588 236.097 200.807 236.097C202.035 236.097 202.829 236.924 202.829 238.2C202.829 239.494 202.035 240.32 200.807 240.32ZM200.807 239.395C201.38 239.395 201.724 238.962 201.724 238.2C201.724 237.439 201.38 237.014 200.807 237.014C200.226 237.014 199.882 237.439 199.882 238.2C199.882 238.962 200.226 239.395 200.807 239.395ZM204.676 240.222H203.571V236.187H204.611V236.776C204.848 236.31 205.208 236.138 205.585 236.138C205.683 236.138 205.822 236.146 205.912 236.171V237.194C205.74 237.169 205.642 237.161 205.503 237.161C204.979 237.161 204.676 237.505 204.676 238.241V240.222ZM213.453 240.222H212.242L211.791 238.913H209.712L209.27 240.222H208.083L210.187 234.493H211.358L213.453 240.222ZM210.744 235.851L210.048 237.906H211.448L210.744 235.851ZM215.275 240.304C214.301 240.304 213.81 239.788 213.81 238.569V236.187H214.906V238.487C214.906 239.15 215.136 239.371 215.586 239.371C216.061 239.371 216.339 239.027 216.339 238.372V236.187H217.444V240.222H216.404V239.715C216.134 240.116 215.758 240.304 215.275 240.304ZM219.822 240.304C218.938 240.304 218.586 239.829 218.586 239.174V237.104H218.022V236.187H218.251C218.496 236.187 218.619 236.064 218.619 235.819V235.09H219.691V236.187H220.526V237.104H219.691V238.913C219.691 239.215 219.781 239.363 220.109 239.363C220.281 239.363 220.387 239.33 220.526 239.289V240.198C220.313 240.263 220.035 240.304 219.822 240.304ZM222.334 240.222H221.229V234.493H222.334V236.653C222.596 236.269 222.972 236.097 223.447 236.097C224.413 236.097 224.904 236.604 224.904 237.824V240.222H223.807V237.914C223.807 237.259 223.578 237.038 223.119 237.038C222.612 237.038 222.334 237.382 222.334 238.029V240.222ZM229.573 238.225V238.43H226.741C226.806 239.125 227.166 239.428 227.658 239.428C228.14 239.428 228.353 239.215 228.451 238.929H229.573C229.27 240.009 228.419 240.32 227.658 240.32C226.422 240.32 225.611 239.494 225.611 238.2C225.611 236.686 226.618 236.097 227.617 236.097C228.877 236.097 229.573 237.005 229.573 238.225ZM226.765 237.75H228.411C228.361 237.194 228.075 236.94 227.617 236.94C227.207 236.94 226.872 237.161 226.765 237.75ZM231.414 240.222H230.309V236.187H231.349V236.678C231.627 236.285 232.012 236.097 232.503 236.097C233.493 236.097 233.984 236.604 233.984 237.824V240.222H232.887V237.914C232.887 237.259 232.658 237.038 232.2 237.038C231.692 237.038 231.414 237.382 231.414 238.029V240.222ZM236.321 240.304C235.437 240.304 235.085 239.829 235.085 239.174V237.104H234.52V236.187H234.749C234.995 236.187 235.117 236.064 235.117 235.819V235.09H236.19V236.187H237.024V237.104H236.19V238.913C236.19 239.215 236.28 239.363 236.607 239.363C236.779 239.363 236.885 239.33 237.024 239.289V240.198C236.812 240.263 236.533 240.304 236.321 240.304ZM238.283 235.573C237.94 235.573 237.686 235.311 237.686 234.984C237.686 234.656 237.94 234.403 238.283 234.403C238.627 234.403 238.881 234.656 238.881 234.984C238.881 235.311 238.627 235.573 238.283 235.573ZM238.832 240.222H237.727V236.187H238.832V240.222ZM241.573 240.32C240.369 240.32 239.584 239.494 239.584 238.2C239.584 236.924 240.394 236.097 241.605 236.097C242.596 236.097 243.357 236.596 243.488 237.619H242.367C242.227 237.21 241.965 237.014 241.573 237.014C241.024 237.014 240.68 237.439 240.68 238.2C240.68 238.962 241.016 239.395 241.573 239.395C241.974 239.395 242.268 239.174 242.383 238.724H243.496C243.332 239.723 242.596 240.32 241.573 240.32ZM245.8 236.097C247.004 236.097 247.528 236.596 247.528 237.791V240.222H246.488V239.698C246.251 240.05 245.858 240.32 245.285 240.32C244.417 240.32 243.877 239.878 243.877 239.15C243.877 238.323 244.581 237.881 245.661 237.881C245.972 237.881 246.202 237.906 246.431 237.955V237.636C246.431 237.136 246.21 236.924 245.76 236.924C245.326 236.924 245.097 237.153 245.072 237.472H243.975C244.057 236.539 244.818 236.097 245.8 236.097ZM245.588 239.486C246.03 239.486 246.431 239.174 246.431 238.683V238.634C246.226 238.577 246.046 238.552 245.76 238.552C245.268 238.552 244.974 238.708 244.974 239.044C244.974 239.322 245.162 239.486 245.588 239.486ZM249.861 240.304C248.977 240.304 248.625 239.829 248.625 239.174V237.104H248.061V236.187H248.29C248.535 236.187 248.658 236.064 248.658 235.819V235.09H249.73V236.187H250.565V237.104H249.73V238.913C249.73 239.215 249.82 239.363 250.148 239.363C250.32 239.363 250.426 239.33 250.565 239.289V240.198C250.352 240.263 250.074 240.304 249.861 240.304ZM251.824 235.573C251.48 235.573 251.227 235.311 251.227 234.984C251.227 234.656 251.48 234.403 251.824 234.403C252.168 234.403 252.422 234.656 252.422 234.984C252.422 235.311 252.168 235.573 251.824 235.573ZM252.373 240.222H251.268V236.187H252.373V240.222ZM255.146 240.32C253.926 240.32 253.124 239.494 253.124 238.2C253.124 236.924 253.926 236.097 255.146 236.097C256.374 236.097 257.168 236.924 257.168 238.2C257.168 239.494 256.374 240.32 255.146 240.32ZM255.146 239.395C255.719 239.395 256.063 238.962 256.063 238.2C256.063 237.439 255.719 237.014 255.146 237.014C254.565 237.014 254.221 237.439 254.221 238.2C254.221 238.962 254.565 239.395 255.146 239.395ZM259.015 240.222H257.91V236.187H258.95V236.678C259.228 236.285 259.613 236.097 260.104 236.097C261.094 236.097 261.585 236.604 261.585 237.824V240.222H260.488V237.914C260.488 237.259 260.259 237.038 259.801 237.038C259.293 237.038 259.015 237.382 259.015 238.029V240.222Z" fill="#002E22"/>
+<circle cx="288.407" cy="238" r="6.25926" fill="#03D47C"/>
+<rect x="270.593" y="232.704" width="23.1111" height="10.5926" rx="5.2963" stroke="#EBE6DF" stroke-width="0.962963"/>
+<path d="M303.656 240H300.42V235.619H303.587V236.432H301.296V237.352H303.287V238.166H301.296V239.186H303.656V240ZM305.152 240H304.332V235.619H305.089L307.099 238.454V235.619H307.925V240H307.167L305.152 237.165V240ZM312.473 240H311.547L311.203 238.999H309.613L309.275 240H308.367L309.976 235.619H310.871L312.473 240ZM310.402 236.658L309.87 238.229H310.94L310.402 236.658ZM315.636 237.703C316.125 237.847 316.4 238.185 316.4 238.686C316.4 239.581 315.818 240 314.791 240H312.926V235.619H314.773C315.618 235.619 316.256 235.931 316.256 236.77C316.256 237.202 316.025 237.553 315.636 237.703ZM314.816 236.37H313.802V237.377H314.816C315.167 237.377 315.386 237.202 315.386 236.864C315.386 236.526 315.167 236.37 314.816 236.37ZM313.802 239.249H314.823C315.242 239.249 315.524 239.086 315.524 238.686C315.524 238.279 315.242 238.116 314.823 238.116H313.802V239.249ZM319.961 240H317.107V235.619H317.983V239.186H319.961V240ZM323.76 240H320.524V235.619H323.691V236.432H321.4V237.352H323.391V238.166H321.4V239.186H323.76V240ZM325.976 240H324.436V235.619H325.913C327.34 235.619 328.242 236.432 328.242 237.79C328.242 239.161 327.365 240 325.976 240ZM325.312 236.432V239.186H325.951C326.833 239.186 327.365 238.673 327.365 237.803C327.365 236.927 326.833 236.432 325.951 236.432H325.312Z" fill="#76847E"/>
+<path d="M169.965 260.407H169.235L168.737 259.05H166.664L166.173 260.407H165.451L167.357 255.352H168.058L169.965 260.407ZM167.697 256.197L166.895 258.414H168.506L167.697 256.197ZM171.82 260.487C170.867 260.487 170.245 259.757 170.245 258.631C170.245 257.511 170.881 256.782 171.82 256.782C172.289 256.782 172.593 256.926 172.903 257.295V255.352H173.575V260.407H172.932V259.931C172.6 260.321 172.289 260.487 171.82 260.487ZM171.914 259.88C172.549 259.88 172.918 259.447 172.918 258.631C172.918 257.815 172.549 257.388 171.914 257.388C171.285 257.388 170.91 257.815 170.91 258.631C170.91 259.447 171.285 259.88 171.914 259.88ZM175.981 260.487C175.028 260.487 174.407 259.757 174.407 258.631C174.407 257.511 175.042 256.782 175.981 256.782C176.451 256.782 176.754 256.926 177.064 257.295V255.352H177.736V260.407H177.093V259.931C176.761 260.321 176.451 260.487 175.981 260.487ZM176.075 259.88C176.711 259.88 177.079 259.447 177.079 258.631C177.079 257.815 176.711 257.388 176.075 257.388C175.447 257.388 175.071 257.815 175.071 258.631C175.071 259.447 175.447 259.88 176.075 259.88ZM184.681 256.782C185.497 256.782 185.909 257.244 185.909 258.241V260.407H185.237V258.284C185.237 257.663 185.042 257.396 184.558 257.396C183.944 257.396 183.691 257.829 183.691 258.58V260.407H183.02V258.284C183.02 257.663 182.818 257.396 182.341 257.396C181.72 257.396 181.474 257.829 181.474 258.58V260.407H180.803V256.861H181.445V257.323C181.72 256.941 182.016 256.782 182.485 256.782C182.984 256.782 183.338 256.977 183.533 257.41C183.778 256.991 184.175 256.782 184.681 256.782ZM188.376 260.487C187.365 260.487 186.693 259.757 186.693 258.631C186.693 257.511 187.365 256.782 188.376 256.782C189.387 256.782 190.051 257.511 190.051 258.631C190.051 259.757 189.387 260.487 188.376 260.487ZM188.376 259.88C189.004 259.88 189.372 259.447 189.372 258.631C189.372 257.815 189.004 257.388 188.376 257.388C187.74 257.388 187.372 257.815 187.372 258.631C187.372 259.447 187.74 259.88 188.376 259.88ZM191.553 260.407H190.881V256.861H191.524V257.461C191.719 257.027 192.058 256.825 192.463 256.825C192.535 256.825 192.629 256.832 192.701 256.854V257.49C192.593 257.475 192.535 257.468 192.441 257.468C191.842 257.468 191.553 257.887 191.553 258.717V260.407ZM196.311 258.522V258.761H193.762C193.798 259.526 194.203 259.895 194.766 259.895C195.206 259.895 195.452 259.736 195.604 259.375H196.297C196.037 260.169 195.43 260.487 194.766 260.487C193.769 260.487 193.076 259.757 193.076 258.631C193.076 257.403 193.82 256.782 194.744 256.782C195.705 256.782 196.311 257.511 196.311 258.522ZM193.784 258.255H195.611C195.568 257.648 195.257 257.36 194.744 257.36C194.231 257.36 193.878 257.641 193.784 258.255ZM200.333 260.487C199.459 260.487 198.931 260.09 198.83 259.346H199.516C199.596 259.757 199.878 259.923 200.347 259.923C200.853 259.923 201.127 259.793 201.127 259.454C201.127 259.187 200.946 259.05 200.455 258.934L200.145 258.862C199.285 258.66 198.946 258.349 198.946 257.807C198.946 257.15 199.451 256.782 200.289 256.782C201.149 256.782 201.669 257.165 201.741 257.872H201.055C200.997 257.49 200.737 257.345 200.304 257.345C199.863 257.345 199.618 257.461 199.618 257.771C199.618 258.024 199.784 258.161 200.253 258.27L200.571 258.342C201.43 258.537 201.799 258.847 201.799 259.411C201.799 260.097 201.25 260.487 200.333 260.487ZM205.586 258.522V258.761H203.037C203.073 259.526 203.477 259.895 204.04 259.895C204.481 259.895 204.727 259.736 204.878 259.375H205.572C205.312 260.169 204.705 260.487 204.04 260.487C203.044 260.487 202.35 259.757 202.35 258.631C202.35 257.403 203.094 256.782 204.019 256.782C204.979 256.782 205.586 257.511 205.586 258.522ZM203.058 258.255H204.885C204.842 257.648 204.532 257.36 204.019 257.36C203.506 257.36 203.152 257.641 203.058 258.255ZM207.813 260.487C206.809 260.487 206.152 259.757 206.152 258.631C206.152 257.511 206.809 256.782 207.813 256.782C208.6 256.782 209.207 257.222 209.373 258.002H208.687C208.543 257.583 208.239 257.388 207.813 257.388C207.192 257.388 206.816 257.822 206.816 258.631C206.816 259.44 207.192 259.88 207.813 259.88C208.246 259.88 208.557 259.692 208.694 259.216H209.38C209.214 260.017 208.615 260.487 207.813 260.487ZM211.313 260.48C210.497 260.48 210.085 260.017 210.085 259.021V256.861H210.757V258.963C210.757 259.598 210.967 259.866 211.472 259.866C212.079 259.866 212.339 259.432 212.339 258.71V256.861H213.01V260.407H212.368V259.931C212.115 260.321 211.797 260.48 211.313 260.48ZM214.764 260.407H214.093V256.861H214.735V257.461C214.93 257.027 215.27 256.825 215.674 256.825C215.746 256.825 215.84 256.832 215.913 256.854V257.49C215.804 257.475 215.746 257.468 215.653 257.468C215.053 257.468 214.764 257.887 214.764 258.717V260.407ZM216.908 256.161C216.684 256.161 216.518 255.987 216.518 255.763C216.518 255.547 216.684 255.373 216.908 255.373C217.131 255.373 217.298 255.547 217.298 255.763C217.298 255.987 217.131 256.161 216.908 256.161ZM217.24 260.407H216.568V256.861H217.24V260.407ZM219.415 260.465C218.7 260.465 218.454 260.104 218.454 259.526V257.468H217.92V256.861H218.129C218.353 256.861 218.454 256.76 218.454 256.536V255.879H219.126V256.861H219.935V257.468H219.126V259.382C219.126 259.685 219.198 259.851 219.581 259.851C219.718 259.851 219.812 259.837 219.935 259.801V260.393C219.762 260.436 219.588 260.465 219.415 260.465ZM220.853 262.047C220.68 262.047 220.535 262.032 220.405 261.996L220.449 261.411C220.564 261.447 220.665 261.462 220.766 261.462C221.041 261.462 221.178 261.368 221.301 261.021L221.539 260.35L220.196 256.861H220.904L221.893 259.548L222.817 256.861H223.504L221.907 261.166C221.662 261.823 221.402 262.047 220.853 262.047ZM227.152 260.465C226.437 260.465 226.191 260.104 226.191 259.526V257.468H225.657V256.861H225.866C226.09 256.861 226.191 256.76 226.191 256.536V255.879H226.863V256.861H227.672V257.468H226.863V259.382C226.863 259.685 226.935 259.851 227.318 259.851C227.455 259.851 227.549 259.837 227.672 259.801V260.393C227.499 260.436 227.325 260.465 227.152 260.465ZM229.762 260.487C228.751 260.487 228.08 259.757 228.08 258.631C228.08 257.511 228.751 256.782 229.762 256.782C230.774 256.782 231.438 257.511 231.438 258.631C231.438 259.757 230.774 260.487 229.762 260.487ZM229.762 259.88C230.391 259.88 230.759 259.447 230.759 258.631C230.759 257.815 230.391 257.388 229.762 257.388C229.127 257.388 228.759 257.815 228.759 258.631C228.759 259.447 229.127 259.88 229.762 259.88ZM234.409 262.047C234.235 262.047 234.091 262.032 233.961 261.996L234.004 261.411C234.12 261.447 234.221 261.462 234.322 261.462C234.597 261.462 234.734 261.368 234.857 261.021L235.095 260.35L233.752 256.861H234.459L235.449 259.548L236.373 256.861H237.059L235.463 261.166C235.218 261.823 234.958 262.047 234.409 262.047ZM239.016 260.487C238.005 260.487 237.333 259.757 237.333 258.631C237.333 257.511 238.005 256.782 239.016 256.782C240.027 256.782 240.691 257.511 240.691 258.631C240.691 259.757 240.027 260.487 239.016 260.487ZM239.016 259.88C239.644 259.88 240.013 259.447 240.013 258.631C240.013 257.815 239.644 257.388 239.016 257.388C238.38 257.388 238.012 257.815 238.012 258.631C238.012 259.447 238.38 259.88 239.016 259.88ZM242.706 260.48C241.89 260.48 241.478 260.017 241.478 259.021V256.861H242.15V258.963C242.15 259.598 242.359 259.866 242.865 259.866C243.471 259.866 243.731 259.432 243.731 258.71V256.861H244.403V260.407H243.76V259.931C243.508 260.321 243.19 260.48 242.706 260.48ZM246.157 260.407H245.485V256.861H246.128V257.461C246.323 257.027 246.662 256.825 247.067 256.825C247.139 256.825 247.233 256.832 247.305 256.854V257.49C247.197 257.475 247.139 257.468 247.045 257.468C246.446 257.468 246.157 257.887 246.157 258.717V260.407ZM253.525 260.407H249.993V255.352H253.438V256.002H250.694V257.49H253.084V258.14H250.694V259.757H253.525V260.407ZM254.668 260.407H253.91L255.116 258.587L253.975 256.861H254.748L255.513 258.06L256.272 256.861H257.03L255.882 258.573L257.095 260.407H256.322L255.484 259.1L254.668 260.407ZM258.401 261.975H257.729V256.861H258.372V257.323C258.675 256.941 259.015 256.782 259.484 256.782C260.437 256.782 261.059 257.511 261.059 258.631C261.059 259.757 260.423 260.487 259.484 260.487C259.015 260.487 258.675 260.328 258.401 259.967V261.975ZM259.39 259.88C260.019 259.88 260.394 259.447 260.394 258.631C260.394 257.815 260.019 257.388 259.39 257.388C258.755 257.388 258.386 257.815 258.386 258.631C258.386 259.447 258.755 259.88 259.39 259.88ZM264.873 258.522V258.761H262.324C262.36 259.526 262.764 259.895 263.328 259.895C263.768 259.895 264.014 259.736 264.165 259.375H264.859C264.599 260.169 263.992 260.487 263.328 260.487C262.331 260.487 261.638 259.757 261.638 258.631C261.638 257.403 262.381 256.782 263.306 256.782C264.266 256.782 264.873 257.511 264.873 258.522ZM262.345 258.255H264.173C264.129 257.648 263.819 257.36 263.306 257.36C262.793 257.36 262.439 257.641 262.345 258.255ZM266.364 260.407H265.692V256.861H266.335V257.323C266.609 256.941 266.927 256.782 267.418 256.782C268.241 256.782 268.653 257.244 268.653 258.241V260.407H267.981V258.298C267.981 257.663 267.772 257.396 267.266 257.396C266.624 257.396 266.364 257.829 266.364 258.551V260.407ZM270.911 260.487C270.038 260.487 269.51 260.09 269.409 259.346H270.095C270.175 259.757 270.456 259.923 270.926 259.923C271.431 259.923 271.706 259.793 271.706 259.454C271.706 259.187 271.525 259.05 271.034 258.934L270.724 258.862C269.864 258.66 269.525 258.349 269.525 257.807C269.525 257.15 270.03 256.782 270.868 256.782C271.728 256.782 272.248 257.165 272.32 257.872H271.634C271.576 257.49 271.316 257.345 270.883 257.345C270.442 257.345 270.196 257.461 270.196 257.771C270.196 258.024 270.363 258.161 270.832 258.27L271.15 258.342C272.009 258.537 272.378 258.847 272.378 259.411C272.378 260.097 271.829 260.487 270.911 260.487ZM273.522 256.161C273.298 256.161 273.132 255.987 273.132 255.763C273.132 255.547 273.298 255.373 273.522 255.373C273.745 255.373 273.912 255.547 273.912 255.763C273.912 255.987 273.745 256.161 273.522 256.161ZM273.854 260.407H273.182V256.861H273.854V260.407ZM275.733 260.407H275.068V257.468H274.534V256.861H275.061V256.24C275.061 255.626 275.444 255.272 276.116 255.272C276.267 255.272 276.412 255.294 276.549 255.33V255.937C276.441 255.901 276.339 255.886 276.231 255.886C275.906 255.886 275.733 255.995 275.733 256.348V256.861H276.477V257.468H275.733V260.407ZM277.382 262.047C277.209 262.047 277.065 262.032 276.935 261.996L276.978 261.411C277.093 261.447 277.195 261.462 277.296 261.462C277.57 261.462 277.707 261.368 277.83 261.021L278.068 260.35L276.725 256.861H277.433L278.422 259.548L279.347 256.861H280.033L278.437 261.166C278.191 261.823 277.931 262.047 277.382 262.047ZM283.956 256.782C284.873 256.782 285.364 257.186 285.364 258.212V260.407H284.721V259.916C284.505 260.227 284.172 260.487 283.616 260.487C282.901 260.487 282.396 260.118 282.396 259.49C282.396 258.761 283.01 258.385 283.92 258.385C284.187 258.385 284.425 258.407 284.692 258.465V258.103C284.692 257.569 284.418 257.36 283.941 257.36C283.457 257.36 283.212 257.569 283.161 257.937H282.482C282.54 257.193 283.147 256.782 283.956 256.782ZM283.746 259.923C284.252 259.923 284.692 259.555 284.692 259.042V258.985C284.44 258.92 284.223 258.891 283.941 258.891C283.4 258.891 283.075 259.064 283.075 259.432C283.075 259.743 283.284 259.923 283.746 259.923ZM287.815 260.487C286.811 260.487 286.154 259.757 286.154 258.631C286.154 257.511 286.811 256.782 287.815 256.782C288.602 256.782 289.209 257.222 289.375 258.002H288.689C288.544 257.583 288.241 257.388 287.815 257.388C287.194 257.388 286.818 257.822 286.818 258.631C286.818 259.44 287.194 259.88 287.815 259.88C288.248 259.88 288.559 259.692 288.696 259.216H289.382C289.216 260.017 288.616 260.487 287.815 260.487ZM291.525 260.487C290.521 260.487 289.863 259.757 289.863 258.631C289.863 257.511 290.521 256.782 291.525 256.782C292.312 256.782 292.918 257.222 293.085 258.002H292.398C292.254 257.583 291.951 257.388 291.525 257.388C290.903 257.388 290.528 257.822 290.528 258.631C290.528 259.44 290.903 259.88 291.525 259.88C291.958 259.88 292.268 259.692 292.406 259.216H293.092C292.926 260.017 292.326 260.487 291.525 260.487ZM295.256 260.487C294.245 260.487 293.573 259.757 293.573 258.631C293.573 257.511 294.245 256.782 295.256 256.782C296.267 256.782 296.932 257.511 296.932 258.631C296.932 259.757 296.267 260.487 295.256 260.487ZM295.256 259.88C295.884 259.88 296.253 259.447 296.253 258.631C296.253 257.815 295.884 257.388 295.256 257.388C294.621 257.388 294.252 257.815 294.252 258.631C294.252 259.447 294.621 259.88 295.256 259.88ZM298.946 260.48C298.13 260.48 297.718 260.017 297.718 259.021V256.861H298.39V258.963C298.39 259.598 298.599 259.866 299.105 259.866C299.712 259.866 299.972 259.432 299.972 258.71V256.861H300.643V260.407H300.001V259.931C299.748 260.321 299.43 260.48 298.946 260.48ZM302.397 260.407H301.725V256.861H302.368V257.323C302.643 256.941 302.96 256.782 303.452 256.782C304.275 256.782 304.687 257.244 304.687 258.241V260.407H304.015V258.298C304.015 257.663 303.805 257.396 303.3 257.396C302.657 257.396 302.397 257.829 302.397 258.551V260.407ZM306.815 260.465C306.1 260.465 305.854 260.104 305.854 259.526V257.468H305.32V256.861H305.529C305.753 256.861 305.854 256.76 305.854 256.536V255.879H306.526V256.861H307.335V257.468H306.526V259.382C306.526 259.685 306.598 259.851 306.981 259.851C307.118 259.851 307.212 259.837 307.335 259.801V260.393C307.162 260.436 306.988 260.465 306.815 260.465ZM311.233 260.407H310.619L309.536 256.861H310.229L310.988 259.512L311.797 256.861H312.367L313.176 259.512L313.92 256.861H314.599L313.494 260.407H312.88L312.064 257.728L311.233 260.407ZM315.55 256.161C315.326 256.161 315.16 255.987 315.16 255.763C315.16 255.547 315.326 255.373 315.55 255.373C315.774 255.373 315.94 255.547 315.94 255.763C315.94 255.987 315.774 256.161 315.55 256.161ZM315.882 260.407H315.211V256.861H315.882V260.407ZM318.057 260.465C317.342 260.465 317.097 260.104 317.097 259.526V257.468H316.562V256.861H316.772C316.996 256.861 317.097 256.76 317.097 256.536V255.879H317.769V256.861H318.577V257.468H317.769V259.382C317.769 259.685 317.841 259.851 318.224 259.851C318.361 259.851 318.455 259.837 318.577 259.801V260.393C318.404 260.436 318.231 260.465 318.057 260.465ZM319.938 260.407H319.266V255.352H319.938V257.316C320.198 256.926 320.516 256.782 320.999 256.782C321.816 256.782 322.227 257.244 322.227 258.241V260.407H321.556V258.298C321.556 257.663 321.346 257.396 320.841 257.396C320.198 257.396 319.938 257.829 319.938 258.551V260.407ZM327.103 260.407H326.403V256.002H324.85V255.352H328.656V256.002H327.103V260.407ZM330.432 260.407H329.818L328.734 256.861H329.428L330.186 259.512L330.995 256.861H331.565L332.374 259.512L333.118 256.861H333.797L332.692 260.407H332.078L331.262 257.728L330.432 260.407ZM335.775 260.487C334.764 260.487 334.093 259.757 334.093 258.631C334.093 257.511 334.764 256.782 335.775 256.782C336.786 256.782 337.451 257.511 337.451 258.631C337.451 259.757 336.786 260.487 335.775 260.487ZM335.775 259.88C336.404 259.88 336.772 259.447 336.772 258.631C336.772 257.815 336.404 257.388 335.775 257.388C335.14 257.388 334.771 257.815 334.771 258.631C334.771 259.447 335.14 259.88 335.775 259.88ZM341.014 260.407H340.313V255.352H343.506V256.002H341.014V257.612H343.289V258.262H341.014V260.407ZM345.549 256.782C346.466 256.782 346.958 257.186 346.958 258.212V260.407H346.315V259.916C346.098 260.227 345.766 260.487 345.21 260.487C344.495 260.487 343.989 260.118 343.989 259.49C343.989 258.761 344.603 258.385 345.513 258.385C345.78 258.385 346.019 258.407 346.286 258.465V258.103C346.286 257.569 346.011 257.36 345.535 257.36C345.051 257.36 344.805 257.569 344.755 257.937H344.076C344.134 257.193 344.74 256.782 345.549 256.782ZM345.34 259.923C345.845 259.923 346.286 259.555 346.286 259.042V258.985C346.033 258.92 345.816 258.891 345.535 258.891C344.993 258.891 344.668 259.064 344.668 259.432C344.668 259.743 344.878 259.923 345.34 259.923ZM349.408 260.487C348.404 260.487 347.747 259.757 347.747 258.631C347.747 257.511 348.404 256.782 349.408 256.782C350.195 256.782 350.802 257.222 350.968 258.002H350.282C350.138 257.583 349.834 257.388 349.408 257.388C348.787 257.388 348.412 257.822 348.412 258.631C348.412 259.44 348.787 259.88 349.408 259.88C349.842 259.88 350.152 259.692 350.289 259.216H350.975C350.809 260.017 350.21 260.487 349.408 260.487ZM352.814 260.465C352.099 260.465 351.854 260.104 351.854 259.526V257.468H351.319V256.861H351.529C351.753 256.861 351.854 256.76 351.854 256.536V255.879H352.525V256.861H353.334V257.468H352.525V259.382C352.525 259.685 352.598 259.851 352.98 259.851C353.118 259.851 353.212 259.837 353.334 259.801V260.393C353.161 260.436 352.988 260.465 352.814 260.465ZM355.425 260.487C354.414 260.487 353.742 259.757 353.742 258.631C353.742 257.511 354.414 256.782 355.425 256.782C356.436 256.782 357.1 257.511 357.1 258.631C357.1 259.757 356.436 260.487 355.425 260.487ZM355.425 259.88C356.053 259.88 356.422 259.447 356.422 258.631C356.422 257.815 356.053 257.388 355.425 257.388C354.789 257.388 354.421 257.815 354.421 258.631C354.421 259.447 354.789 259.88 355.425 259.88ZM358.602 260.407H357.93V256.861H358.573V257.461C358.768 257.027 359.108 256.825 359.512 256.825C359.584 256.825 359.678 256.832 359.75 256.854V257.49C359.642 257.475 359.584 257.468 359.49 257.468C358.891 257.468 358.602 257.887 358.602 258.717V260.407ZM366.403 260.407H365.674L365.176 259.05H363.103L362.612 260.407H361.89L363.796 255.352H364.497L366.403 260.407ZM364.136 256.197L363.334 258.414H364.945L364.136 256.197ZM368.136 260.48C367.319 260.48 366.908 260.017 366.908 259.021V256.861H367.579V258.963C367.579 259.598 367.789 259.866 368.294 259.866C368.901 259.866 369.161 259.432 369.161 258.71V256.861H369.833V260.407H369.19V259.931C368.937 260.321 368.619 260.48 368.136 260.48ZM372.005 260.465C371.29 260.465 371.045 260.104 371.045 259.526V257.468H370.51V256.861H370.72C370.944 256.861 371.045 256.76 371.045 256.536V255.879H371.717V256.861H372.525V257.468H371.717V259.382C371.717 259.685 371.789 259.851 372.172 259.851C372.309 259.851 372.403 259.837 372.525 259.801V260.393C372.352 260.436 372.179 260.465 372.005 260.465ZM373.886 260.407H373.214V255.352H373.886V257.316C374.146 256.926 374.464 256.782 374.947 256.782C375.764 256.782 376.175 257.244 376.175 258.241V260.407H375.504V258.298C375.504 257.663 375.294 257.396 374.789 257.396C374.146 257.396 373.886 257.829 373.886 258.551V260.407ZM380.196 258.522V258.761H377.647C377.683 259.526 378.087 259.895 378.65 259.895C379.091 259.895 379.337 259.736 379.488 259.375H380.182C379.922 260.169 379.315 260.487 378.65 260.487C377.654 260.487 376.96 259.757 376.96 258.631C376.96 257.403 377.704 256.782 378.629 256.782C379.589 256.782 380.196 257.511 380.196 258.522ZM377.668 258.255H379.495C379.452 257.648 379.142 257.36 378.629 257.36C378.116 257.36 377.762 257.641 377.668 258.255ZM381.686 260.407H381.015V256.861H381.657V257.323C381.932 256.941 382.25 256.782 382.741 256.782C383.564 256.782 383.976 257.244 383.976 258.241V260.407H383.304V258.298C383.304 257.663 383.095 257.396 382.589 257.396C381.946 257.396 381.686 257.829 381.686 258.551V260.407ZM386.104 260.465C385.389 260.465 385.144 260.104 385.144 259.526V257.468H384.609V256.861H384.819C385.043 256.861 385.144 256.76 385.144 256.536V255.879H385.815V256.861H386.624V257.468H385.815V259.382C385.815 259.685 385.888 259.851 386.27 259.851C386.408 259.851 386.502 259.837 386.624 259.801V260.393C386.451 260.436 386.278 260.465 386.104 260.465ZM387.652 256.161C387.429 256.161 387.262 255.987 387.262 255.763C387.262 255.547 387.429 255.373 387.652 255.373C387.876 255.373 388.042 255.547 388.042 255.763C388.042 255.987 387.876 256.161 387.652 256.161ZM387.985 260.407H387.313V256.861H387.985V260.407ZM390.478 260.487C389.474 260.487 388.816 259.757 388.816 258.631C388.816 257.511 389.474 256.782 390.478 256.782C391.265 256.782 391.871 257.222 392.038 258.002H391.351C391.207 257.583 390.904 257.388 390.478 257.388C389.856 257.388 389.481 257.822 389.481 258.631C389.481 259.44 389.856 259.88 390.478 259.88C390.911 259.88 391.221 259.692 391.359 259.216H392.045C391.879 260.017 391.279 260.487 390.478 260.487ZM394.038 256.782C394.955 256.782 395.447 257.186 395.447 258.212V260.407H394.804V259.916C394.587 260.227 394.255 260.487 393.699 260.487C392.984 260.487 392.478 260.118 392.478 259.49C392.478 258.761 393.092 258.385 394.002 258.385C394.269 258.385 394.508 258.407 394.775 258.465V258.103C394.775 257.569 394.5 257.36 394.024 257.36C393.54 257.36 393.294 257.569 393.244 257.937H392.565C392.623 257.193 393.229 256.782 394.038 256.782ZM393.829 259.923C394.334 259.923 394.775 259.555 394.775 259.042V258.985C394.522 258.92 394.305 258.891 394.024 258.891C393.482 258.891 393.157 259.064 393.157 259.432C393.157 259.743 393.367 259.923 393.829 259.923ZM397.579 260.465C396.864 260.465 396.619 260.104 396.619 259.526V257.468H396.084V256.861H396.294C396.518 256.861 396.619 256.76 396.619 256.536V255.879H397.291V256.861H398.099V257.468H397.291V259.382C397.291 259.685 397.363 259.851 397.746 259.851C397.883 259.851 397.977 259.837 398.099 259.801V260.393C397.926 260.436 397.753 260.465 397.579 260.465ZM399.128 256.161C398.904 256.161 398.738 255.987 398.738 255.763C398.738 255.547 398.904 255.373 399.128 255.373C399.351 255.373 399.518 255.547 399.518 255.763C399.518 255.987 399.351 256.161 399.128 256.161ZM399.46 260.407H398.788V256.861H399.46V260.407ZM401.974 260.487C400.963 260.487 400.292 259.757 400.292 258.631C400.292 257.511 400.963 256.782 401.974 256.782C402.985 256.782 403.65 257.511 403.65 258.631C403.65 259.757 402.985 260.487 401.974 260.487ZM401.974 259.88C402.603 259.88 402.971 259.447 402.971 258.631C402.971 257.815 402.603 257.388 401.974 257.388C401.339 257.388 400.97 257.815 400.97 258.631C400.97 259.447 401.339 259.88 401.974 259.88ZM405.152 260.407H404.48V256.861H405.123V257.323C405.397 256.941 405.715 256.782 406.206 256.782C407.029 256.782 407.441 257.244 407.441 258.241V260.407H406.769V258.298C406.769 257.663 406.56 257.396 406.054 257.396C405.412 257.396 405.152 257.829 405.152 258.551V260.407ZM411.977 261.592H411.385C410.771 260.667 410.468 259.548 410.468 258.335C410.468 257.128 410.779 256.002 411.385 255.085H411.977C411.414 256.052 411.111 257.078 411.111 258.335C411.111 259.598 411.407 260.624 411.977 261.592ZM415.592 260.407H412.306V259.837C414.032 258.53 414.805 257.778 414.805 256.84C414.805 256.269 414.48 255.908 413.931 255.908C413.404 255.908 413.086 256.233 413.014 256.796H412.313C412.386 255.865 413.028 255.272 413.946 255.272C414.993 255.272 415.52 255.944 415.52 256.775C415.52 257.959 414.567 258.782 413.288 259.772H415.592V260.407ZM417.143 260.407H416.443V255.352H419.635V256.002H417.143V257.612H419.418V258.262H417.143V260.407ZM424.09 260.407H423.36L422.862 259.05H420.789L420.298 260.407H419.576L421.482 255.352H422.183L424.09 260.407ZM421.822 256.197L421.02 258.414H422.631L421.822 256.197ZM424.954 261.592H424.362C424.932 260.624 425.236 259.598 425.236 258.342C425.236 257.078 424.94 256.052 424.362 255.085H424.954C425.575 256.002 425.879 257.128 425.879 258.342C425.879 259.548 425.568 260.675 424.954 261.592ZM427.117 260.429C426.857 260.429 426.684 260.234 426.684 259.981C426.684 259.736 426.857 259.541 427.117 259.541C427.377 259.541 427.551 259.736 427.551 259.981C427.551 260.234 427.377 260.429 427.117 260.429ZM432.061 260.407H431.31L429.916 255.352H430.653L431.714 259.49L432.921 255.352H433.636L434.849 259.49L435.911 255.352H436.633L435.239 260.407H434.481L433.26 256.312L432.061 260.407ZM437.927 260.407H437.255V255.352H437.927V257.316C438.187 256.926 438.504 256.782 438.988 256.782C439.804 256.782 440.216 257.244 440.216 258.241V260.407H439.544V258.298C439.544 257.663 439.335 257.396 438.829 257.396C438.187 257.396 437.927 257.829 437.927 258.551V260.407ZM444.237 258.522V258.761H441.687C441.723 259.526 442.128 259.895 442.691 259.895C443.132 259.895 443.377 259.736 443.529 259.375H444.222C443.962 260.169 443.356 260.487 442.691 260.487C441.695 260.487 441.001 259.757 441.001 258.631C441.001 257.403 441.745 256.782 442.67 256.782C443.63 256.782 444.237 257.511 444.237 258.522ZM441.709 258.255H443.536C443.493 257.648 443.182 257.36 442.67 257.36C442.157 257.36 441.803 257.641 441.709 258.255ZM445.727 260.407H445.056V256.861H445.698V257.323C445.973 256.941 446.291 256.782 446.782 256.782C447.605 256.782 448.017 257.244 448.017 258.241V260.407H447.345V258.298C447.345 257.663 447.136 257.396 446.63 257.396C445.987 257.396 445.727 257.829 445.727 258.551V260.407ZM166.83 270.451C166.195 270.451 165.949 270.162 165.949 269.591V265.352H166.621V269.454C166.621 269.736 166.707 269.858 166.96 269.858C167.011 269.858 167.061 269.858 167.119 269.851V270.415C167.04 270.436 166.931 270.451 166.83 270.451ZM169.213 270.487C168.202 270.487 167.53 269.757 167.53 268.631C167.53 267.511 168.202 266.782 169.213 266.782C170.224 266.782 170.888 267.511 170.888 268.631C170.888 269.757 170.224 270.487 169.213 270.487ZM169.213 269.88C169.841 269.88 170.209 269.447 170.209 268.631C170.209 267.815 169.841 267.388 169.213 267.388C168.577 267.388 168.209 267.815 168.209 268.631C168.209 269.447 168.577 269.88 169.213 269.88ZM172.484 269.931H173.719C174.528 269.931 174.961 270.256 174.961 270.862C174.961 271.599 174.326 272.047 173.105 272.047C172 272.047 171.444 271.678 171.444 271.115C171.444 270.805 171.617 270.581 171.957 270.429C171.617 270.285 171.509 269.996 171.509 269.743C171.509 269.461 171.682 269.216 171.978 269.042C171.726 268.804 171.581 268.479 171.581 268.111C171.581 267.338 172.173 266.782 173.076 266.782C173.372 266.782 173.632 266.84 173.856 266.948C174.029 266.608 174.239 266.348 174.889 266.32V266.905C174.549 266.905 174.354 267.027 174.253 267.251C174.456 267.475 174.571 267.771 174.571 268.111C174.571 268.883 173.979 269.432 173.076 269.432C172.802 269.432 172.556 269.382 172.347 269.281C172.195 269.375 172.123 269.497 172.123 269.627C172.123 269.808 172.224 269.931 172.484 269.931ZM173.076 267.331C172.571 267.331 172.238 267.648 172.238 268.111C172.238 268.573 172.578 268.883 173.076 268.883C173.574 268.883 173.907 268.573 173.907 268.111C173.907 267.641 173.574 267.331 173.076 267.331ZM173.127 271.505C173.885 271.505 174.289 271.339 174.289 270.927C174.289 270.631 174.087 270.523 173.647 270.523H172.498H172.462C172.238 270.638 172.087 270.768 172.087 271.007C172.087 271.317 172.332 271.505 173.127 271.505ZM176.377 269.931H177.612C178.421 269.931 178.854 270.256 178.854 270.862C178.854 271.599 178.219 272.047 176.998 272.047C175.893 272.047 175.337 271.678 175.337 271.115C175.337 270.805 175.51 270.581 175.85 270.429C175.51 270.285 175.402 269.996 175.402 269.743C175.402 269.461 175.575 269.216 175.872 269.042C175.619 268.804 175.474 268.479 175.474 268.111C175.474 267.338 176.067 266.782 176.969 266.782C177.265 266.782 177.525 266.84 177.749 266.948C177.923 266.608 178.132 266.348 178.782 266.32V266.905C178.443 266.905 178.248 267.027 178.147 267.251C178.349 267.475 178.464 267.771 178.464 268.111C178.464 268.883 177.872 269.432 176.969 269.432C176.695 269.432 176.449 269.382 176.24 269.281C176.088 269.375 176.016 269.497 176.016 269.627C176.016 269.808 176.117 269.931 176.377 269.931ZM176.969 267.331C176.464 267.331 176.132 267.648 176.132 268.111C176.132 268.573 176.471 268.883 176.969 268.883C177.468 268.883 177.8 268.573 177.8 268.111C177.8 267.641 177.468 267.331 176.969 267.331ZM177.02 271.505C177.778 271.505 178.183 271.339 178.183 270.927C178.183 270.631 177.98 270.523 177.54 270.523H176.392H176.355C176.132 270.638 175.98 270.768 175.98 271.007C175.98 271.317 176.225 271.505 177.02 271.505ZM179.844 266.161C179.62 266.161 179.454 265.987 179.454 265.763C179.454 265.547 179.62 265.373 179.844 265.373C180.068 265.373 180.234 265.547 180.234 265.763C180.234 265.987 180.068 266.161 179.844 266.161ZM180.177 270.407H179.505V266.861H180.177V270.407ZM181.933 270.407H181.261V266.861H181.904V267.323C182.178 266.941 182.496 266.782 182.987 266.782C183.81 266.782 184.222 267.244 184.222 268.241V270.407H183.55V268.298C183.55 267.663 183.341 267.396 182.835 267.396C182.193 267.396 181.933 267.829 181.933 268.551V270.407ZM186.026 269.931H187.261C188.069 269.931 188.503 270.256 188.503 270.862C188.503 271.599 187.867 272.047 186.647 272.047C185.542 272.047 184.986 271.678 184.986 271.115C184.986 270.805 185.159 270.581 185.498 270.429C185.159 270.285 185.051 269.996 185.051 269.743C185.051 269.461 185.224 269.216 185.52 269.042C185.267 268.804 185.123 268.479 185.123 268.111C185.123 267.338 185.715 266.782 186.618 266.782C186.914 266.782 187.174 266.84 187.398 266.948C187.571 266.608 187.781 266.348 188.431 266.32V266.905C188.091 266.905 187.896 267.027 187.795 267.251C187.997 267.475 188.113 267.771 188.113 268.111C188.113 268.883 187.521 269.432 186.618 269.432C186.343 269.432 186.098 269.382 185.888 269.281C185.737 269.375 185.664 269.497 185.664 269.627C185.664 269.808 185.766 269.931 186.026 269.931ZM186.618 267.331C186.112 267.331 185.78 267.648 185.78 268.111C185.78 268.573 186.119 268.883 186.618 268.883C187.116 268.883 187.448 268.573 187.448 268.111C187.448 267.641 187.116 267.331 186.618 267.331ZM186.668 271.505C187.427 271.505 187.831 271.339 187.831 270.927C187.831 270.631 187.629 270.523 187.188 270.523H186.04H186.004C185.78 270.638 185.628 270.768 185.628 271.007C185.628 271.317 185.874 271.505 186.668 271.505ZM191.475 266.161C191.251 266.161 191.085 265.987 191.085 265.763C191.085 265.547 191.251 265.373 191.475 265.373C191.698 265.373 191.865 265.547 191.865 265.763C191.865 265.987 191.698 266.161 191.475 266.161ZM191.807 270.407H191.135V266.861H191.807V270.407ZM193.563 270.407H192.891V266.861H193.534V267.323C193.809 266.941 194.126 266.782 194.617 266.782C195.441 266.782 195.852 267.244 195.852 268.241V270.407H195.181V268.298C195.181 267.663 194.971 267.396 194.466 267.396C193.823 267.396 193.563 267.829 193.563 268.551V270.407ZM197.093 271.303H196.652C196.97 270.935 197.129 270.638 197.143 270.429C196.782 270.451 196.659 270.241 196.659 269.996C196.659 269.757 196.84 269.541 197.114 269.541C197.374 269.541 197.613 269.736 197.613 270.147C197.613 270.646 197.367 271.014 197.093 271.303ZM200.604 272.047C200.431 272.047 200.286 272.032 200.156 271.996L200.199 271.411C200.315 271.447 200.416 271.462 200.517 271.462C200.792 271.462 200.929 271.368 201.052 271.021L201.29 270.35L199.947 266.861H200.654L201.644 269.548L202.568 266.861H203.254L201.658 271.166C201.413 271.823 201.153 272.047 200.604 272.047ZM205.211 270.487C204.2 270.487 203.528 269.757 203.528 268.631C203.528 267.511 204.2 266.782 205.211 266.782C206.222 266.782 206.887 267.511 206.887 268.631C206.887 269.757 206.222 270.487 205.211 270.487ZM205.211 269.88C205.839 269.88 206.208 269.447 206.208 268.631C206.208 267.815 205.839 267.388 205.211 267.388C204.576 267.388 204.207 267.815 204.207 268.631C204.207 269.447 204.576 269.88 205.211 269.88ZM208.901 270.48C208.085 270.48 207.673 270.017 207.673 269.021V266.861H208.345V268.963C208.345 269.598 208.554 269.866 209.06 269.866C209.667 269.866 209.927 269.432 209.927 268.71V266.861H210.598V270.407H209.956V269.931C209.703 270.321 209.385 270.48 208.901 270.48ZM211.883 267.078H211.442C211.76 266.71 211.919 266.413 211.933 266.204C211.572 266.226 211.449 266.016 211.449 265.771C211.449 265.532 211.63 265.316 211.904 265.316C212.164 265.316 212.403 265.511 212.403 265.922C212.403 266.421 212.157 266.789 211.883 267.078ZM214.134 270.451C213.499 270.451 213.253 270.162 213.253 269.591V265.352H213.925V269.454C213.925 269.736 214.012 269.858 214.264 269.858C214.315 269.858 214.365 269.858 214.423 269.851V270.415C214.344 270.436 214.235 270.451 214.134 270.451ZM215.933 270.451C215.297 270.451 215.052 270.162 215.052 269.591V265.352H215.723V269.454C215.723 269.736 215.81 269.858 216.063 269.858C216.113 269.858 216.164 269.858 216.222 269.851V270.415C216.142 270.436 216.034 270.451 215.933 270.451ZM219.574 270.407H218.903V266.861H219.545V267.323C219.82 266.941 220.138 266.782 220.629 266.782C221.452 266.782 221.864 267.244 221.864 268.241V270.407H221.192V268.298C221.192 267.663 220.983 267.396 220.477 267.396C219.834 267.396 219.574 267.829 219.574 268.551V270.407ZM225.884 268.522V268.761H223.335C223.371 269.526 223.776 269.895 224.339 269.895C224.779 269.895 225.025 269.736 225.177 269.375H225.87C225.61 270.169 225.003 270.487 224.339 270.487C223.342 270.487 222.649 269.757 222.649 268.631C222.649 267.403 223.393 266.782 224.317 266.782C225.278 266.782 225.884 267.511 225.884 268.522ZM223.357 268.255H225.184C225.141 267.648 224.83 267.36 224.317 267.36C223.804 267.36 223.451 267.641 223.357 268.255ZM229.686 268.522V268.761H227.137C227.173 269.526 227.577 269.895 228.14 269.895C228.581 269.895 228.827 269.736 228.978 269.375H229.672C229.412 270.169 228.805 270.487 228.14 270.487C227.144 270.487 226.45 269.757 226.45 268.631C226.45 267.403 227.194 266.782 228.119 266.782C229.079 266.782 229.686 267.511 229.686 268.522ZM227.158 268.255H228.985C228.942 267.648 228.632 267.36 228.119 267.36C227.606 267.36 227.252 267.641 227.158 268.255ZM231.826 270.487C230.873 270.487 230.252 269.757 230.252 268.631C230.252 267.511 230.888 266.782 231.826 266.782C232.296 266.782 232.599 266.926 232.91 267.295V265.352H233.581V270.407H232.939V269.931C232.606 270.321 232.296 270.487 231.826 270.487ZM231.92 269.88C232.556 269.88 232.924 269.447 232.924 268.631C232.924 267.815 232.556 267.388 231.92 267.388C231.292 267.388 230.916 267.815 230.916 268.631C230.916 269.447 231.292 269.88 231.92 269.88ZM237.738 270.465C237.023 270.465 236.778 270.104 236.778 269.526V267.468H236.243V266.861H236.453C236.677 266.861 236.778 266.76 236.778 266.536V265.879H237.45V266.861H238.258V267.468H237.45V269.382C237.45 269.685 237.522 269.851 237.905 269.851C238.042 269.851 238.136 269.837 238.258 269.801V270.393C238.085 270.436 237.912 270.465 237.738 270.465ZM240.349 270.487C239.338 270.487 238.666 269.757 238.666 268.631C238.666 267.511 239.338 266.782 240.349 266.782C241.36 266.782 242.024 267.511 242.024 268.631C242.024 269.757 241.36 270.487 240.349 270.487ZM240.349 269.88C240.977 269.88 241.346 269.447 241.346 268.631C241.346 267.815 240.977 267.388 240.349 267.388C239.713 267.388 239.345 267.815 239.345 268.631C239.345 269.447 239.713 269.88 240.349 269.88ZM247.819 268.522V268.761H245.27C245.306 269.526 245.71 269.895 246.274 269.895C246.714 269.895 246.96 269.736 247.111 269.375H247.805C247.545 270.169 246.938 270.487 246.274 270.487C245.277 270.487 244.584 269.757 244.584 268.631C244.584 267.403 245.327 266.782 246.252 266.782C247.212 266.782 247.819 267.511 247.819 268.522ZM245.291 268.255H247.119C247.075 267.648 246.765 267.36 246.252 267.36C245.739 267.36 245.385 267.641 245.291 268.255ZM249.31 270.407H248.638V266.861H249.281V267.323C249.555 266.941 249.873 266.782 250.364 266.782C251.187 266.782 251.599 267.244 251.599 268.241V270.407H250.927V268.298C250.927 267.663 250.718 267.396 250.212 267.396C249.57 267.396 249.31 267.829 249.31 268.551V270.407ZM253.727 270.465C253.012 270.465 252.767 270.104 252.767 269.526V267.468H252.232V266.861H252.442C252.666 266.861 252.767 266.76 252.767 266.536V265.879H253.439V266.861H254.247V267.468H253.439V269.382C253.439 269.685 253.511 269.851 253.894 269.851C254.031 269.851 254.125 269.837 254.247 269.801V270.393C254.074 270.436 253.901 270.465 253.727 270.465ZM257.891 268.522V268.761H255.341C255.377 269.526 255.782 269.895 256.345 269.895C256.786 269.895 257.031 269.736 257.183 269.375H257.876C257.616 270.169 257.01 270.487 256.345 270.487C255.348 270.487 254.655 269.757 254.655 268.631C254.655 267.403 255.399 266.782 256.323 266.782C257.284 266.782 257.891 267.511 257.891 268.522ZM255.363 268.255H257.19C257.147 267.648 256.836 267.36 256.323 267.36C255.811 267.36 255.457 267.641 255.363 268.255ZM259.381 270.407H258.709V266.861H259.352V267.461C259.547 267.027 259.887 266.825 260.291 266.825C260.363 266.825 260.457 266.832 260.529 266.854V267.49C260.421 267.475 260.363 267.468 260.269 267.468C259.67 267.468 259.381 267.887 259.381 268.717V270.407ZM264.532 266.782C265.449 266.782 265.94 267.186 265.94 268.212V270.407H265.297V269.916C265.081 270.227 264.749 270.487 264.192 270.487C263.477 270.487 262.972 270.118 262.972 269.49C262.972 268.761 263.586 268.385 264.496 268.385C264.763 268.385 265.001 268.407 265.269 268.465V268.103C265.269 267.569 264.994 267.36 264.517 267.36C264.034 267.36 263.788 267.569 263.737 267.937H263.059C263.116 267.193 263.723 266.782 264.532 266.782ZM264.322 269.923C264.828 269.923 265.269 269.555 265.269 269.042V268.985C265.016 268.92 264.799 268.891 264.517 268.891C263.976 268.891 263.651 269.064 263.651 269.432C263.651 269.743 263.86 269.923 264.322 269.923ZM270.373 270.487C269.369 270.487 268.712 269.757 268.712 268.631C268.712 267.511 269.369 266.782 270.373 266.782C271.16 266.782 271.767 267.222 271.933 268.002H271.247C271.102 267.583 270.799 267.388 270.373 267.388C269.752 267.388 269.376 267.822 269.376 268.631C269.376 269.44 269.752 269.88 270.373 269.88C270.806 269.88 271.117 269.692 271.254 269.216H271.94C271.774 270.017 271.174 270.487 270.373 270.487ZM274.104 270.487C273.093 270.487 272.422 269.757 272.422 268.631C272.422 267.511 273.093 266.782 274.104 266.782C275.115 266.782 275.78 267.511 275.78 268.631C275.78 269.757 275.115 270.487 274.104 270.487ZM274.104 269.88C274.733 269.88 275.101 269.447 275.101 268.631C275.101 267.815 274.733 267.388 274.104 267.388C273.469 267.388 273.1 267.815 273.1 268.631C273.1 269.447 273.469 269.88 274.104 269.88ZM277.932 270.487C276.978 270.487 276.357 269.757 276.357 268.631C276.357 267.511 276.993 266.782 277.932 266.782C278.401 266.782 278.704 266.926 279.015 267.295V265.352H279.687V270.407H279.044V269.931C278.712 270.321 278.401 270.487 277.932 270.487ZM278.025 269.88C278.661 269.88 279.029 269.447 279.029 268.631C279.029 267.815 278.661 267.388 278.025 267.388C277.397 267.388 277.022 267.815 277.022 268.631C277.022 269.447 277.397 269.88 278.025 269.88ZM283.754 268.522V268.761H281.204C281.241 269.526 281.645 269.895 282.208 269.895C282.649 269.895 282.894 269.736 283.046 269.375H283.739C283.479 270.169 282.873 270.487 282.208 270.487C281.212 270.487 280.518 269.757 280.518 268.631C280.518 267.403 281.262 266.782 282.187 266.782C283.147 266.782 283.754 267.511 283.754 268.522ZM281.226 268.255H283.053C283.01 267.648 282.699 267.36 282.187 267.36C281.674 267.36 281.32 267.641 281.226 268.255ZM287.32 269.931H288.555C289.364 269.931 289.797 270.256 289.797 270.862C289.797 271.599 289.162 272.047 287.941 272.047C286.836 272.047 286.28 271.678 286.28 271.115C286.28 270.805 286.453 270.581 286.793 270.429C286.453 270.285 286.345 269.996 286.345 269.743C286.345 269.461 286.518 269.216 286.815 269.042C286.562 268.804 286.417 268.479 286.417 268.111C286.417 267.338 287.01 266.782 287.912 266.782C288.208 266.782 288.468 266.84 288.692 266.948C288.866 266.608 289.075 266.348 289.725 266.32V266.905C289.386 266.905 289.191 267.027 289.09 267.251C289.292 267.475 289.407 267.771 289.407 268.111C289.407 268.883 288.815 269.432 287.912 269.432C287.638 269.432 287.392 269.382 287.183 269.281C287.031 269.375 286.959 269.497 286.959 269.627C286.959 269.808 287.06 269.931 287.32 269.931ZM287.912 267.331C287.407 267.331 287.075 267.648 287.075 268.111C287.075 268.573 287.414 268.883 287.912 268.883C288.411 268.883 288.743 268.573 288.743 268.111C288.743 267.641 288.411 267.331 287.912 267.331ZM287.963 271.505C288.721 271.505 289.126 271.339 289.126 270.927C289.126 270.631 288.923 270.523 288.483 270.523H287.335H287.298C287.075 270.638 286.923 270.768 286.923 271.007C286.923 271.317 287.168 271.505 287.963 271.505ZM293.289 268.522V268.761H290.74C290.776 269.526 291.181 269.895 291.744 269.895C292.184 269.895 292.43 269.736 292.582 269.375H293.275C293.015 270.169 292.408 270.487 291.744 270.487C290.747 270.487 290.054 269.757 290.054 268.631C290.054 267.403 290.798 266.782 291.722 266.782C292.683 266.782 293.289 267.511 293.289 268.522ZM290.762 268.255H292.589C292.546 267.648 292.235 267.36 291.722 267.36C291.209 267.36 290.856 267.641 290.762 268.255ZM294.78 270.407H294.108V266.861H294.751V267.323C295.025 266.941 295.343 266.782 295.834 266.782C296.658 266.782 297.069 267.244 297.069 268.241V270.407H296.398V268.298C296.398 267.663 296.188 267.396 295.683 267.396C295.04 267.396 294.78 267.829 294.78 268.551V270.407ZM301.09 268.522V268.761H298.541C298.577 269.526 298.981 269.895 299.544 269.895C299.985 269.895 300.231 269.736 300.382 269.375H301.076C300.816 270.169 300.209 270.487 299.544 270.487C298.548 270.487 297.854 269.757 297.854 268.631C297.854 267.403 298.598 266.782 299.523 266.782C300.483 266.782 301.09 267.511 301.09 268.522ZM298.562 268.255H300.389C300.346 267.648 300.036 267.36 299.523 267.36C299.01 267.36 298.656 267.641 298.562 268.255ZM302.58 270.407H301.909V266.861H302.552V267.461C302.747 267.027 303.086 266.825 303.49 266.825C303.563 266.825 303.657 266.832 303.729 266.854V267.49C303.62 267.475 303.563 267.468 303.469 267.468C302.869 267.468 302.58 267.887 302.58 268.717V270.407ZM305.679 266.782C306.596 266.782 307.087 267.186 307.087 268.212V270.407H306.444V269.916C306.228 270.227 305.896 270.487 305.339 270.487C304.624 270.487 304.119 270.118 304.119 269.49C304.119 268.761 304.733 268.385 305.643 268.385C305.91 268.385 306.148 268.407 306.416 268.465V268.103C306.416 267.569 306.141 267.36 305.664 267.36C305.181 267.36 304.935 267.569 304.884 267.937H304.206C304.263 267.193 304.87 266.782 305.679 266.782ZM305.469 269.923C305.975 269.923 306.416 269.555 306.416 269.042V268.985C306.163 268.92 305.946 268.891 305.664 268.891C305.123 268.891 304.798 269.064 304.798 269.432C304.798 269.743 305.007 269.923 305.469 269.923ZM309.22 270.465C308.505 270.465 308.26 270.104 308.26 269.526V267.468H307.725V266.861H307.935C308.158 266.861 308.26 266.76 308.26 266.536V265.879H308.931V266.861H309.74V267.468H308.931V269.382C308.931 269.685 309.003 269.851 309.386 269.851C309.523 269.851 309.617 269.837 309.74 269.801V270.393C309.567 270.436 309.393 270.465 309.22 270.465ZM313.383 268.522V268.761H310.834C310.87 269.526 311.274 269.895 311.838 269.895C312.278 269.895 312.524 269.736 312.676 269.375H313.369C313.109 270.169 312.502 270.487 311.838 270.487C310.841 270.487 310.148 269.757 310.148 268.631C310.148 267.403 310.892 266.782 311.816 266.782C312.777 266.782 313.383 267.511 313.383 268.522ZM310.856 268.255H312.683C312.639 267.648 312.329 267.36 311.816 267.36C311.303 267.36 310.949 267.641 310.856 268.255ZM315.524 270.487C314.57 270.487 313.949 269.757 313.949 268.631C313.949 267.511 314.585 266.782 315.524 266.782C315.993 266.782 316.297 266.926 316.607 267.295V265.352H317.279V270.407H316.636V269.931C316.304 270.321 315.993 270.487 315.524 270.487ZM315.618 269.88C316.253 269.88 316.622 269.447 316.622 268.631C316.622 267.815 316.253 267.388 315.618 267.388C314.989 267.388 314.614 267.815 314.614 268.631C314.614 269.447 314.989 269.88 315.618 269.88ZM322.093 270.487C321.616 270.487 321.306 270.328 320.988 269.945V270.407H320.345V265.352H321.017V267.316C321.327 266.941 321.638 266.782 322.1 266.782C323.054 266.782 323.675 267.511 323.675 268.631C323.675 269.757 323.054 270.487 322.093 270.487ZM322.006 269.88C322.635 269.88 323.01 269.447 323.01 268.631C323.01 267.815 322.635 267.388 322.006 267.388C321.371 267.388 321.002 267.815 321.002 268.631C321.002 269.447 321.371 269.88 322.006 269.88ZM324.616 272.047C324.443 272.047 324.298 272.032 324.168 271.996L324.212 271.411C324.327 271.447 324.428 271.462 324.529 271.462C324.804 271.462 324.941 271.368 325.064 271.021L325.302 270.35L323.959 266.861H324.667L325.656 269.548L326.58 266.861H327.267L325.67 271.166C325.425 271.823 325.165 272.047 324.616 272.047ZM329.983 272.047C329.81 272.047 329.665 272.032 329.535 271.996L329.579 271.411C329.694 271.447 329.795 271.462 329.897 271.462C330.171 271.462 330.308 271.368 330.431 271.021L330.669 270.35L329.326 266.861H330.034L331.023 269.548L331.948 266.861H332.634L331.038 271.166C330.792 271.823 330.532 272.047 329.983 272.047ZM334.59 270.487C333.579 270.487 332.908 269.757 332.908 268.631C332.908 267.511 333.579 266.782 334.59 266.782C335.602 266.782 336.266 267.511 336.266 268.631C336.266 269.757 335.602 270.487 334.59 270.487ZM334.59 269.88C335.219 269.88 335.587 269.447 335.587 268.631C335.587 267.815 335.219 267.388 334.59 267.388C333.955 267.388 333.587 267.815 333.587 268.631C333.587 269.447 333.955 269.88 334.59 269.88ZM338.28 270.48C337.464 270.48 337.053 270.017 337.053 269.021V266.861H337.724V268.963C337.724 269.598 337.934 269.866 338.439 269.866C339.046 269.866 339.306 269.432 339.306 268.71V266.861H339.978V270.407H339.335V269.931C339.082 270.321 338.764 270.48 338.28 270.48ZM341.731 270.407H341.06V266.861H341.703V267.461C341.898 267.027 342.237 266.825 342.641 266.825C342.714 266.825 342.808 266.832 342.88 266.854V267.49C342.771 267.475 342.714 267.468 342.62 267.468C342.02 267.468 341.731 267.887 341.731 268.717V270.407ZM346.189 271.975H345.517V266.861H346.16V267.323C346.463 266.941 346.803 266.782 347.272 266.782C348.226 266.782 348.847 267.511 348.847 268.631C348.847 269.757 348.211 270.487 347.272 270.487C346.803 270.487 346.463 270.328 346.189 269.967V271.975ZM347.178 269.88C347.807 269.88 348.182 269.447 348.182 268.631C348.182 267.815 347.807 267.388 347.178 267.388C346.543 267.388 346.174 267.815 346.174 268.631C346.174 269.447 346.543 269.88 347.178 269.88ZM350.35 270.407H349.678V266.861H350.321V267.461C350.516 267.027 350.856 266.825 351.26 266.825C351.332 266.825 351.426 266.832 351.498 266.854V267.49C351.39 267.475 351.332 267.468 351.238 267.468C350.639 267.468 350.35 267.887 350.35 268.717V270.407ZM355.109 268.522V268.761H352.559C352.595 269.526 353 269.895 353.563 269.895C354.004 269.895 354.249 269.736 354.401 269.375H355.094C354.834 270.169 354.227 270.487 353.563 270.487C352.566 270.487 351.873 269.757 351.873 268.631C351.873 267.403 352.617 266.782 353.541 266.782C354.502 266.782 355.109 267.511 355.109 268.522ZM352.581 268.255H354.408C354.365 267.648 354.054 267.36 353.541 267.36C353.029 267.36 352.675 267.641 352.581 268.255ZM356.722 270.407H356.057V267.468H355.523V266.861H356.05V266.24C356.05 265.626 356.433 265.272 357.105 265.272C357.256 265.272 357.401 265.294 357.538 265.33V265.937C357.43 265.901 357.328 265.886 357.22 265.886C356.895 265.886 356.722 265.995 356.722 266.348V266.861H357.466V267.468H356.722V270.407ZM361.019 268.522V268.761H358.47C358.506 269.526 358.91 269.895 359.473 269.895C359.914 269.895 360.16 269.736 360.311 269.375H361.005C360.745 270.169 360.138 270.487 359.473 270.487C358.477 270.487 357.783 269.757 357.783 268.631C357.783 267.403 358.527 266.782 359.452 266.782C360.412 266.782 361.019 267.511 361.019 268.522ZM358.491 268.255H360.318C360.275 267.648 359.965 267.36 359.452 267.36C358.939 267.36 358.585 267.641 358.491 268.255ZM362.509 270.407H361.838V266.861H362.481V267.461C362.676 267.027 363.015 266.825 363.419 266.825C363.492 266.825 363.586 266.832 363.658 266.854V267.49C363.549 267.475 363.492 267.468 363.398 267.468C362.798 267.468 362.509 267.887 362.509 268.717V270.407ZM364.985 270.407H364.313V266.861H364.956V267.461C365.151 267.027 365.491 266.825 365.895 266.825C365.967 266.825 366.061 266.832 366.133 266.854V267.49C366.025 267.475 365.967 267.468 365.873 267.468C365.274 267.468 364.985 267.887 364.985 268.717V270.407ZM369.743 268.522V268.761H367.194C367.23 269.526 367.635 269.895 368.198 269.895C368.638 269.895 368.884 269.736 369.036 269.375H369.729C369.469 270.169 368.862 270.487 368.198 270.487C367.201 270.487 366.508 269.757 366.508 268.631C366.508 267.403 367.252 266.782 368.176 266.782C369.137 266.782 369.743 267.511 369.743 268.522ZM367.216 268.255H369.043C369 267.648 368.689 267.36 368.176 267.36C367.663 267.36 367.31 267.641 367.216 268.255ZM371.884 270.487C370.931 270.487 370.309 269.757 370.309 268.631C370.309 267.511 370.945 266.782 371.884 266.782C372.353 266.782 372.657 266.926 372.967 267.295V265.352H373.639V270.407H372.996V269.931C372.664 270.321 372.353 270.487 371.884 270.487ZM371.978 269.88C372.613 269.88 372.982 269.447 372.982 268.631C372.982 267.815 372.613 267.388 371.978 267.388C371.349 267.388 370.974 267.815 370.974 268.631C370.974 269.447 371.349 269.88 371.978 269.88ZM378.07 266.782C378.988 266.782 379.479 267.186 379.479 268.212V270.407H378.836V269.916C378.619 270.227 378.287 270.487 377.731 270.487C377.016 270.487 376.51 270.118 376.51 269.49C376.51 268.761 377.124 268.385 378.034 268.385C378.301 268.385 378.54 268.407 378.807 268.465V268.103C378.807 267.569 378.533 267.36 378.056 267.36C377.572 267.36 377.326 267.569 377.276 267.937H376.597C376.655 267.193 377.261 266.782 378.07 266.782ZM377.861 269.923C378.366 269.923 378.807 269.555 378.807 269.042V268.985C378.554 268.92 378.338 268.891 378.056 268.891C377.514 268.891 377.189 269.064 377.189 269.432C377.189 269.743 377.399 269.923 377.861 269.923ZM381.705 270.48C380.889 270.48 380.478 270.017 380.478 269.021V266.861H381.149V268.963C381.149 269.598 381.359 269.866 381.864 269.866C382.471 269.866 382.731 269.432 382.731 268.71V266.861H383.403V270.407H382.76V269.931C382.507 270.321 382.189 270.48 381.705 270.48ZM385.575 270.465C384.86 270.465 384.615 270.104 384.615 269.526V267.468H384.08V266.861H384.29C384.514 266.861 384.615 266.76 384.615 266.536V265.879H385.286V266.861H386.095V267.468H385.286V269.382C385.286 269.685 385.359 269.851 385.741 269.851C385.879 269.851 385.973 269.837 386.095 269.801V270.393C385.922 270.436 385.749 270.465 385.575 270.465ZM387.456 270.407H386.784V265.352H387.456V267.316C387.716 266.926 388.033 266.782 388.517 266.782C389.333 266.782 389.745 267.244 389.745 268.241V270.407H389.073V268.298C389.073 267.663 388.864 267.396 388.358 267.396C387.716 267.396 387.456 267.829 387.456 268.551V270.407ZM393.766 268.522V268.761H391.216C391.252 269.526 391.657 269.895 392.22 269.895C392.661 269.895 392.906 269.736 393.058 269.375H393.751C393.491 270.169 392.885 270.487 392.22 270.487C391.224 270.487 390.53 269.757 390.53 268.631C390.53 267.403 391.274 266.782 392.199 266.782C393.159 266.782 393.766 267.511 393.766 268.522ZM391.238 268.255H393.065C393.022 267.648 392.711 267.36 392.199 267.36C391.686 267.36 391.332 267.641 391.238 268.255ZM395.256 270.407H394.585V266.861H395.227V267.323C395.502 266.941 395.82 266.782 396.311 266.782C397.134 266.782 397.546 267.244 397.546 268.241V270.407H396.874V268.298C396.874 267.663 396.665 267.396 396.159 267.396C395.516 267.396 395.256 267.829 395.256 268.551V270.407ZM399.674 270.465C398.959 270.465 398.714 270.104 398.714 269.526V267.468H398.179V266.861H398.389C398.613 266.861 398.714 266.76 398.714 266.536V265.879H399.385V266.861H400.194V267.468H399.385V269.382C399.385 269.685 399.458 269.851 399.84 269.851C399.978 269.851 400.071 269.837 400.194 269.801V270.393C400.021 270.436 399.848 270.465 399.674 270.465ZM401.222 266.161C400.998 266.161 400.832 265.987 400.832 265.763C400.832 265.547 400.998 265.373 401.222 265.373C401.446 265.373 401.612 265.547 401.612 265.763C401.612 265.987 401.446 266.161 401.222 266.161ZM401.555 270.407H400.883V266.861H401.555V270.407ZM404.047 270.487C403.044 270.487 402.386 269.757 402.386 268.631C402.386 267.511 403.044 266.782 404.047 266.782C404.835 266.782 405.441 267.222 405.607 268.002H404.921C404.777 267.583 404.474 267.388 404.047 267.388C403.426 267.388 403.051 267.822 403.051 268.631C403.051 269.44 403.426 269.88 404.047 269.88C404.481 269.88 404.791 269.692 404.929 269.216H405.615C405.449 270.017 404.849 270.487 404.047 270.487ZM407.608 266.782C408.525 266.782 409.016 267.186 409.016 268.212V270.407H408.374V269.916C408.157 270.227 407.825 270.487 407.269 270.487C406.554 270.487 406.048 270.118 406.048 269.49C406.048 268.761 406.662 268.385 407.572 268.385C407.839 268.385 408.078 268.407 408.345 268.465V268.103C408.345 267.569 408.07 267.36 407.594 267.36C407.11 267.36 406.864 267.569 406.814 267.937H406.135C406.193 267.193 406.799 266.782 407.608 266.782ZM407.399 269.923C407.904 269.923 408.345 269.555 408.345 269.042V268.985C408.092 268.92 407.875 268.891 407.594 268.891C407.052 268.891 406.727 269.064 406.727 269.432C406.727 269.743 406.936 269.923 407.399 269.923ZM411.149 270.465C410.434 270.465 410.189 270.104 410.189 269.526V267.468H409.654V266.861H409.864C410.088 266.861 410.189 266.76 410.189 266.536V265.879H410.86V266.861H411.669V267.468H410.86V269.382C410.86 269.685 410.933 269.851 411.315 269.851C411.453 269.851 411.547 269.837 411.669 269.801V270.393C411.496 270.436 411.323 270.465 411.149 270.465ZM413.76 270.487C412.749 270.487 412.077 269.757 412.077 268.631C412.077 267.511 412.749 266.782 413.76 266.782C414.771 266.782 415.435 267.511 415.435 268.631C415.435 269.757 414.771 270.487 413.76 270.487ZM413.76 269.88C414.388 269.88 414.756 269.447 414.756 268.631C414.756 267.815 414.388 267.388 413.76 267.388C413.124 267.388 412.756 267.815 412.756 268.631C412.756 269.447 413.124 269.88 413.76 269.88ZM416.937 270.407H416.265V266.861H416.908V267.461C417.103 267.027 417.443 266.825 417.847 266.825C417.919 266.825 418.013 266.832 418.085 266.854V267.49C417.977 267.475 417.919 267.468 417.825 267.468C417.226 267.468 416.937 267.887 416.937 268.717V270.407ZM422.088 266.782C423.005 266.782 423.496 267.186 423.496 268.212V270.407H422.853V269.916C422.637 270.227 422.305 270.487 421.748 270.487C421.033 270.487 420.528 270.118 420.528 269.49C420.528 268.761 421.142 268.385 422.052 268.385C422.319 268.385 422.557 268.407 422.825 268.465V268.103C422.825 267.569 422.55 267.36 422.073 267.36C421.59 267.36 421.344 267.569 421.293 267.937H420.615C420.672 267.193 421.279 266.782 422.088 266.782ZM421.878 269.923C422.384 269.923 422.825 269.555 422.825 269.042V268.985C422.572 268.92 422.355 268.891 422.073 268.891C421.532 268.891 421.207 269.064 421.207 269.432C421.207 269.743 421.416 269.923 421.878 269.923ZM425.161 271.975H424.489V266.861H425.132V267.323C425.435 266.941 425.775 266.782 426.244 266.782C427.197 266.782 427.819 267.511 427.819 268.631C427.819 269.757 427.183 270.487 426.244 270.487C425.775 270.487 425.435 270.328 425.161 269.967V271.975ZM426.15 269.88C426.779 269.88 427.154 269.447 427.154 268.631C427.154 267.815 426.779 267.388 426.15 267.388C425.515 267.388 425.146 267.815 425.146 268.631C425.146 269.447 425.515 269.88 426.15 269.88ZM429.322 271.975H428.65V266.861H429.293V267.323C429.596 266.941 429.936 266.782 430.405 266.782C431.359 266.782 431.98 267.511 431.98 268.631C431.98 269.757 431.344 270.487 430.405 270.487C429.936 270.487 429.596 270.328 429.322 269.967V271.975ZM430.311 269.88C430.94 269.88 431.315 269.447 431.315 268.631C431.315 267.815 430.94 267.388 430.311 267.388C429.676 267.388 429.308 267.815 429.308 268.631C429.308 269.447 429.676 269.88 430.311 269.88ZM432.809 270.429C432.549 270.429 432.376 270.234 432.376 269.981C432.376 269.736 432.549 269.541 432.809 269.541C433.069 269.541 433.242 269.736 433.242 269.981C433.242 270.234 433.069 270.429 432.809 270.429Z" fill="#002E22"/>
+</g>
+</g>
+<rect x="1" y="1" width="384.5" height="262" stroke="#1A3D32" stroke-width="2"/>
+<defs>
+<clipPath id="clip0_1626_5832">
+<rect width="386.5" height="264" fill="white"/>
+</clipPath>
+<clipPath id="clip1_1626_5832">
+<rect x="20" y="20" width="520" height="390.963" rx="11.5556" fill="white"/>
+</clipPath>
+<clipPath id="clip2_1626_5832">
+<rect width="34.6667" height="390.963" fill="white" transform="translate(20 20)"/>
+</clipPath>
+<clipPath id="clip3_1626_5832">
+<rect x="27.7037" y="27.7037" width="19.2593" height="19.2593" rx="9.62963" fill="white"/>
+</clipPath>
+<clipPath id="clip4_1626_5832">
+<rect width="11.5556" height="11.5556" fill="white" transform="translate(31.5555 140.241)"/>
+</clipPath>
+<clipPath id="clip5_1626_5832">
+<rect width="11.5556" height="11.5556" fill="white" transform="translate(31.5555 178.759)"/>
+</clipPath>
+<clipPath id="clip6_1626_5832">
+<rect x="175.037" y="103.185" width="57.7778" height="57.7778" rx="28.8889" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/docs/assets/images/shield.svg b/docs/assets/images/shield.svg
index 9066e116c94c..252da0321692 100644
--- a/docs/assets/images/shield.svg
+++ b/docs/assets/images/shield.svg
@@ -1,4 +1,16 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="#0182ff" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.375 5.75L10.375 4.75C10.25 4.625 10.125 4.625 10 4.625C9.875 4.625 9.75 4.625 9.625 4.75L6.625 5.75C6.125 5.875 5.75 6.5 5.75 7C5.875 9.875 6.875 13.25 10 15C13.125 13.375 14 9.875 14.25 7C14.25 6.375 13.875 5.875 13.375 5.75Z" />
-<path d="M16.625 3.5L10.375 1.375C10.125 1.25 9.875 1.25 9.625 1.375L3.375 3.5C2.875 3.625 2.5 4.125 2.5 4.625C2.625 9.625 4.25 15.125 9.625 18.5C9.875 18.625 10.125 18.625 10.25 18.5C15.75 15.375 17.25 9.75 17.375 4.625C17.5 4.125 17.125 3.625 16.625 3.5ZM10.625 16.125L10 16.375L9.375 16C6.5 14.375 4.75 11.25 4.5 7C4.5 5.875 5.125 4.875 6.25 4.5L9.25 3.5C9.5 3.5 9.75 3.375 10 3.375C10.25 3.375 10.5 3.375 10.75 3.5L13.75 4.5C14.875 4.875 15.5 5.875 15.5 7C15.25 11.375 13.5 14.5 10.625 16.125Z"/>
+<svg width="69" height="68" viewBox="0 0 69 68" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M55.6745 15.1571L52.6469 14.2475L49.9225 11.3715L41.2903 14.3991L34.6288 8.19238L27.9673 14.2475L19.4868 11.0684C19.4868 11.0684 17.5203 13.9443 16.3076 14.2475C15.0949 14.5507 13.1285 15.3086 13.1285 15.3086C13.1285 15.3086 8.73658 59.3705 33.8751 59.0674C59.0094 58.7642 56.8914 21.0606 55.6787 15.1571H55.6745Z" fill="#DEB606"/>
+<path d="M18.4261 12.58C18.4261 12.58 15.2469 53.4628 34.0229 53.6144C48.8618 53.766 50.8325 28.0253 51.283 24.3914C51.7378 20.7574 51.283 13.6412 51.283 13.6412L49.9187 11.3715L41.2866 14.3991L34.6251 8.19238L27.9636 14.2475L19.483 11.0684L18.4219 12.5843L18.4261 12.58Z" fill="#F8D004"/>
+<path d="M34.6292 45.3866C41.0408 45.3866 46.2384 39.286 46.2384 31.7605C46.2384 24.2349 41.0408 18.1343 34.6292 18.1343C28.2176 18.1343 23.02 24.2349 23.02 31.7605C23.02 39.286 28.2176 45.3866 34.6292 45.3866Z" fill="#FFE789"/>
+<path d="M37.0498 27.6251L34.9318 23.688L33.7191 24.1891L31.2978 28.2272L26.6533 28.9347L26.8554 30.2484L29.5798 33.0739L29.4788 37.8195L30.2872 38.8301L34.6286 37.112L38.3636 38.729L39.6731 38.0216L39.37 33.1749L42.3007 29.7431L41.8964 28.6315L37.0498 27.6251Z" fill="#F8D004"/>
+<path d="M44.6889 13.022C44.3983 14.3274 45.0847 15.6833 46.0574 16.6012C47.0301 17.5192 48.2554 18.1045 49.4092 18.7782C50.5629 19.4519 51.7041 20.273 52.3062 21.4647C52.9842 22.8037 52.8831 24.3912 53.2284 25.8524C53.5737 27.3135 54.7527 28.8462 56.2391 28.6273L55.6749 15.1527C55.6749 15.1527 52.4957 14.3948 51.7883 13.4852C51.0809 12.5757 49.9187 11.3672 49.9187 11.3672L44.6846 13.0178L44.6889 13.022Z" fill="#FFE789"/>
+<path d="M13.9333 35.2847C13.849 33.0319 18.4683 35.651 19.7273 37.5206C20.9864 39.3902 21.3906 41.6851 22.0559 43.8368C23.016 46.9444 24.7045 50.0015 27.5005 51.6605C28.9237 52.5069 30.6586 53.0248 31.5723 54.4018C32.5156 55.825 32.2713 57.6988 31.9934 59.3874C31.9934 59.3874 14.7417 56.3682 13.9375 35.2847H13.9333Z" fill="#FFE789"/>
+<path d="M23.6009 26.16C22.805 28.059 27.6769 25.9831 29.3065 24.7241C30.216 24.0209 31.0498 23.225 31.7909 22.3492C32.9657 20.9638 33.9384 19.3637 35.4164 18.3068C35.4164 18.3068 27.5127 16.8246 23.6009 26.16Z" fill="#FFECAC"/>
+<path d="M13.1245 15.1064C13.1245 15.1064 8.47998 59.1178 34.7259 59.1178" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M56.016 15.1064C56.016 15.1064 60.6605 59.1178 34.4146 59.1178" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.1245 15.1067C16.1142 15.1067 17.9206 13.0055 18.7207 11.7802C19.0365 11.2917 19.6681 11.1107 20.2029 11.338L27.2139 14.273C27.6602 14.4582 28.1739 14.3614 28.5234 14.0287L34.5533 8.19678" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M56.1295 15.1067C53.1398 15.1067 51.3334 13.0055 50.5333 11.7802C50.2175 11.2917 49.5859 11.1107 49.0511 11.338L42.0401 14.273C41.5938 14.4582 41.08 14.3614 40.7306 14.0287L34.7007 8.19678" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.2742 12.8833C18.2742 12.8833 15.2803 53.8966 34.2668 53.8966C53.2533 53.8966 51.4343 13.3339 51.4343 13.3339" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M34.2418 45.2852C40.872 45.2852 46.2468 39.1676 46.2468 31.6211C46.2468 24.0746 40.872 17.957 34.2418 17.957C27.6116 17.957 22.2368 24.0746 22.2368 31.6211C22.2368 39.1676 27.6116 45.2852 34.2418 45.2852Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M35.3575 24.0586L37.0629 27.5114C37.206 27.802 37.484 28.0041 37.804 28.0504L41.6148 28.602C42.419 28.7199 42.7433 29.7095 42.1579 30.2779L39.3999 32.9644C39.1683 33.1918 39.063 33.516 39.1177 33.8318L39.7704 37.6258C39.9094 38.43 39.0672 39.0406 38.3472 38.6616L34.9406 36.872C34.6543 36.7205 34.3132 36.7205 34.0269 36.872L30.6203 38.6616C29.9003 39.0406 29.0581 38.43 29.1971 37.6258L29.8498 33.8318C29.9045 33.5118 29.7992 33.1876 29.5676 32.9644L26.8096 30.2779C26.2285 29.7095 26.5485 28.7199 27.3527 28.602L31.1635 28.0504C31.4836 28.0041 31.7615 27.802 31.9046 27.5114L33.61 24.0586C33.9721 23.3301 35.0122 23.3301 35.3701 24.0586H35.3575Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/docs/assets/images/workflow.svg b/docs/assets/images/workflow.svg
new file mode 100644
index 000000000000..e5eac423cd1d
--- /dev/null
+++ b/docs/assets/images/workflow.svg
@@ -0,0 +1,117 @@
+<svg width="69" height="68" viewBox="0 0 69 68" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M42.7591 53.9363V58.1179C42.7591 59.1844 42.1953 59.6871 41.157 59.6871H31.9856C31.4171 59.6871 30.9943 59.5321 30.7218 59.222L30.6795 59.1656C30.4822 58.9119 30.3882 58.5642 30.3882 58.1179V53.9363C30.3882 52.865 30.952 52.3623 31.9856 52.3623H41.157C41.7067 52.3623 42.1248 52.5033 42.3926 52.7946V52.804C42.637 53.0624 42.7591 53.4382 42.7591 53.9363Z" fill="#5AB0FF"/>
+<path d="M42.7591 33.0193V37.2009C42.7591 38.2674 42.1953 38.7701 41.157 38.7701H31.9856C31.4171 38.7701 30.9943 38.6151 30.7218 38.305L30.6795 38.2486C30.4822 37.9949 30.3882 37.6472 30.3882 37.2009V33.0193C30.3882 31.948 30.952 31.4453 31.9856 31.4453H41.157C41.7067 31.4453 42.1248 31.5863 42.3926 31.8776V31.887C42.637 32.1454 42.7591 32.5212 42.7591 33.0193Z" fill="#5AB0FF"/>
+<path d="M42.7591 12.1062V16.2878C42.7591 17.3543 42.1953 17.8571 41.157 17.8571H31.9856C31.4171 17.8571 30.9943 17.702 30.7218 17.3919L30.6795 17.3355C30.4822 17.0818 30.3882 16.7341 30.3882 16.2878V12.1062C30.3882 11.035 30.952 10.5322 31.9856 10.5322H41.157C41.7067 10.5322 42.1248 10.6732 42.3926 10.9645V10.9739C42.637 11.2323 42.7591 11.6082 42.7591 12.1062Z" fill="#5AB0FF"/>
+<path d="M13.6251 49.1393H9.97442C9.40591 49.1393 8.98305 48.9842 8.71054 48.6741L8.66826 48.6178C8.47092 48.3641 8.37695 48.0164 8.37695 47.57V43.3884C8.37695 42.3172 8.94076 41.8145 9.97442 41.8145H19.1457C19.6954 41.8145 20.1136 41.9554 20.3814 42.2467V42.2561C20.6257 42.5145 20.7479 42.8904 20.7479 43.3884V47.57C20.7479 48.6366 20.1841 49.1393 19.1457 49.1393H13.6251Z" fill="#B0D9FF"/>
+<path d="M62.6663 22.4709V26.6525C62.6663 27.7191 62.1025 28.2218 61.0642 28.2218H51.8929C51.3244 28.2218 50.9015 28.0668 50.629 27.7567L50.5867 27.7003C50.3894 27.4466 50.2954 27.0989 50.2954 26.6525V22.4709C50.2954 21.3997 50.8592 20.897 51.8929 20.897H61.0642C61.6139 20.897 62.0321 21.0379 62.2999 21.3292V21.3386C62.5442 21.597 62.6663 21.9729 62.6663 22.4709Z" fill="#B0D9FF"/>
+<path d="M18.234 11.6268C18.7696 12.3409 19.0844 13.2336 19.0844 14.1968C19.0844 16.5742 17.158 18.5006 14.7806 18.5006C13.5966 18.5006 12.516 18.0166 11.736 17.2414C10.9561 16.4615 10.4722 15.3855 10.4722 14.1968C10.4722 11.8194 12.4032 9.89307 14.7759 9.89307C16.1901 9.89307 17.4399 10.5696 18.2246 11.6221C18.2246 11.6221 18.2293 11.6221 18.2293 11.6268H18.234Z" fill="#B0D9FF"/>
+<path d="M57.1976 55.6889L51.3716 60.1947V51.1831L57.1976 55.6889Z" fill="#003C73"/>
+<path d="M30.3883 53.9365V58.1181C30.3883 58.5645 30.4869 58.9122 30.6796 59.1659L29.6083 57.7939L29.5707 57.7235C29.4439 57.4885 29.3828 57.1925 29.3828 56.8308V52.6492C29.3828 51.5779 29.9466 51.0752 30.9803 51.0752H40.1516C40.6402 51.0752 41.0255 51.188 41.2933 51.4229L41.3591 51.4887L42.3927 52.7995C42.1249 52.5082 41.7068 52.3673 41.1571 52.3673H31.9857C30.9474 52.3673 30.3883 52.87 30.3883 53.9412V53.9365Z" fill="#003C73"/>
+<path d="M19.1448 41.8098H9.97353C8.93518 41.8098 8.37607 42.3126 8.37607 43.3838V47.5654C8.37607 48.0117 8.47473 48.3594 8.66737 48.6131L7.59613 47.2412L7.55854 47.1707C7.43168 46.9358 7.37061 46.6398 7.37061 46.278V42.0964C7.37061 41.0252 7.93442 40.5225 8.96807 40.5225H18.1394C18.628 40.5225 19.0133 40.6352 19.2811 40.8701L19.3469 40.9359L20.3805 42.2468C20.1127 41.9555 19.6946 41.8145 19.1448 41.8145V41.8098Z" fill="#003C73"/>
+<path d="M61.2663 20.023L62.3 21.3339C62.0322 21.0426 61.614 20.9016 61.0643 20.9016H51.893C50.8546 20.9016 50.2955 21.4044 50.2955 22.4756V26.6572C50.2955 27.1035 50.3942 27.4512 50.5868 27.7049L49.5156 26.333L49.478 26.2625C49.3511 26.0276 49.29 25.7316 49.29 25.3698V21.1882C49.29 20.117 49.8538 19.6143 50.8875 19.6143H60.0588C60.5475 19.6143 60.9327 19.727 61.2005 19.9619L61.2663 20.0277V20.023Z" fill="#003C73"/>
+<path d="M30.3883 12.1062V16.2877C30.3883 16.7341 30.4869 17.0818 30.6796 17.3355L29.6083 15.9636L29.5707 15.8931C29.4439 15.6582 29.3828 15.3622 29.3828 15.0004V10.8235C29.3828 9.75224 29.9466 9.24951 30.9803 9.24951H40.1516C40.6402 9.24951 41.0255 9.36227 41.2933 9.59719L41.3591 9.66297L42.3927 10.9738C42.1249 10.6825 41.7068 10.5416 41.1571 10.5416H31.9857C30.9474 10.5416 30.3883 11.0443 30.3883 12.1155V12.1062Z" fill="#003C73"/>
+<path d="M16.7118 9.76647L16.8386 9.89332C17.5152 10.5699 17.9099 11.1149 18.2294 11.6223C17.4447 10.5699 16.1949 9.89332 14.7807 9.89332C12.4033 9.89332 10.477 11.8244 10.477 14.1971C10.477 15.3858 10.9609 16.4617 11.7408 17.2417L11.722 17.2604C11.0549 16.6356 10.5756 15.9637 10.1716 15.2683C9.72991 14.5917 9.4668 13.7836 9.4668 12.9097C9.4668 10.537 11.3978 8.60596 13.7705 8.60596C14.9029 8.60596 15.9365 9.04761 16.7071 9.76647H16.7118Z" fill="#003C73"/>
+<path d="M30.3883 33.0191V37.2006C30.3883 37.647 30.4869 37.9947 30.6796 38.2484L29.6083 36.8765L29.5707 36.806C29.4439 36.5711 29.3828 36.2751 29.3828 35.9133V31.7317C29.3828 30.6604 29.9466 30.1577 30.9803 30.1577H40.1516C40.6402 30.1577 41.0255 30.2705 41.2933 30.5054L41.3591 30.5712L42.3927 31.882C42.1249 31.5907 41.7068 31.4498 41.1571 31.4498H31.9857C30.9474 31.4498 30.3883 31.9525 30.3883 33.0238V33.0191Z" fill="#003C73"/>
+<path d="M18.234 11.6268C18.7696 12.3409 19.0844 13.2336 19.0844 14.1968C19.0844 16.5742 17.158 18.5006 14.7806 18.5006C13.5966 18.5006 12.516 18.0166 11.736 17.2414C10.9561 16.4615 10.4722 15.3855 10.4722 14.1968C10.4722 11.8194 12.4032 9.89307 14.7759 9.89307C16.1901 9.89307 17.4399 10.5696 18.2246 11.6221" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M31.9902 10.5322H41.1569" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M31.9902 17.8569H41.1569" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.7588 12.1064V13.8637V16.288" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.3882 12.1064V16.288" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.3882 12.1062C30.3882 11.035 30.952 10.5322 31.9856 10.5322" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.3924 10.9645C42.1246 10.6732 41.7065 10.5322 41.1567 10.5322" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.7588 12.1064C42.7588 11.6131 42.6366 11.2372 42.397 10.9741" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.7266 17.3921C30.9944 17.7022 31.4219 17.8572 31.9904 17.8572" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.3882 16.2881C30.3882 16.7344 30.4868 17.0821 30.6795 17.3358" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.7589 16.2881C42.7589 17.3546 42.1951 17.8574 41.1567 17.8574" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10.1716 15.2683C9.72991 14.5917 9.4668 13.7836 9.4668 12.9097C9.4668 10.537 11.3978 8.60596 13.7705 8.60596C14.9029 8.60596 15.9365 9.04761 16.7071 9.76647" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.9805 9.24951H40.1518" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M29.3828 10.8237V15.0006" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M29.3828 10.8235C29.3828 9.75224 29.9466 9.24951 30.9803 9.24951" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M41.2941 9.5928C41.0262 9.36258 40.641 9.24512 40.1523 9.24512" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M29.3828 15.0005C29.3828 15.3623 29.4486 15.6583 29.5707 15.8932" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M18.2333 11.6268C18.2333 11.6268 18.2333 11.6268 18.2286 11.6221C17.9091 11.1147 17.5145 10.5649 16.8379 9.89307" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.7595 17.2931C11.7595 17.2931 11.736 17.2696 11.7219 17.2602C11.0547 16.6353 10.5755 15.9634 10.1714 15.2681" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.7261 17.3917L30.6838 17.3353L29.6079 15.9634" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.3977 10.9738L42.393 10.9644L41.3594 9.6582" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M51.8936 20.897H61.0649" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M51.8936 28.2222H56.3852H61.0649" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M62.6621 22.4712V26.6528" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M50.2954 22.4712V26.6528" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M50.2954 22.4709C50.2954 21.3997 50.8592 20.897 51.8929 20.897" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M62.2996 21.3292C62.0318 21.0379 61.6137 20.897 61.064 20.897" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M62.6665 22.4712C62.6665 21.9779 62.5443 21.602 62.3047 21.3389" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M50.6299 27.7568C50.8977 28.0669 51.3252 28.222 51.8938 28.222" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M50.2954 26.6528C50.2954 27.0992 50.3941 27.4469 50.5867 27.7006" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M62.6661 26.6528C62.6661 27.7194 62.1023 28.2221 61.064 28.2221" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M50.8828 19.6143H56.1544H60.0541" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M49.2856 21.1885V25.3701" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M49.2856 21.1882C49.2856 20.117 49.8495 19.6143 50.8831 19.6143" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M61.1964 19.9575C60.9286 19.7273 60.5433 19.6099 60.0547 19.6099" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M49.2856 25.3701C49.2856 25.7319 49.3514 26.0279 49.4736 26.2628" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M50.6287 27.7569L50.5864 27.7006L49.5151 26.3286" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M62.3045 21.3385L62.2998 21.3291L61.2661 20.0229" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.97363 41.8096H19.1449" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.97363 49.1392H13.6243H19.1449" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20.7422 43.3838V47.5654" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.37695 43.3838V47.5654" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.37695 43.3835C8.37695 42.3123 8.94076 41.8096 9.97442 41.8096" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20.3812 42.2467C20.1134 41.9554 19.6952 41.8145 19.1455 41.8145" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20.7475 43.3838C20.7475 42.8904 20.6254 42.5146 20.3857 42.2515" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.70996 48.6738C8.97777 48.9839 9.40533 49.139 9.97384 49.139" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.37695 47.5654C8.37695 48.0118 8.47562 48.3595 8.66826 48.6132" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20.7477 47.5654C20.7477 48.632 20.1839 49.1347 19.1455 49.1347" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.96387 40.5269H13.8549H18.1352" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.36621 42.1011V46.2827" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.36621 42.1008C7.36621 41.0296 7.93002 40.5269 8.96367 40.5269" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.2765 40.8745C19.0087 40.6443 18.6234 40.5269 18.1348 40.5269" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.36621 46.2827C7.36621 46.6445 7.43199 46.9405 7.55415 47.1754" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.71021 48.6739L8.66792 48.6128L7.59668 47.2456" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20.3855 42.2563L20.3808 42.2469L19.3472 40.936" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M31.9902 31.4453H41.1569" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M31.9902 38.77H41.1569" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.7588 33.019V37.2006" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.3882 33.019V37.2006" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.3882 33.0193C30.3882 31.948 30.952 31.4453 31.9856 31.4453" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.3924 31.882C42.1246 31.5907 41.7065 31.4497 41.1567 31.4497" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.7588 33.019C42.7588 32.5257 42.6366 32.1498 42.397 31.8867" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.7266 38.3096C30.9944 38.6197 31.4219 38.7747 31.9904 38.7747" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.3882 37.2007C30.3882 37.647 30.4868 37.9947 30.6795 38.2484" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.7589 37.2007C42.7589 38.2672 42.1951 38.77 41.1567 38.77" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.9805 30.1621H40.1518" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M29.3828 31.7363V35.9179" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M29.3828 31.7361C29.3828 30.6648 29.9466 30.1621 30.9803 30.1621" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M41.2941 30.5054C41.0262 30.2752 40.641 30.1577 40.1523 30.1577" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M29.3828 35.918C29.3828 36.2797 29.4486 36.5757 29.5707 36.8107" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.7261 38.3092L30.6838 38.2481L29.6079 36.8809" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.3977 31.8911L42.393 31.8817L41.3594 30.5708" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M31.9902 52.3579H41.1569" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M31.9902 59.6875H41.1569" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.7588 53.9365V58.1134" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.3882 53.9365V58.1134" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.3882 53.9363C30.3882 52.865 30.952 52.3623 31.9856 52.3623" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.3924 52.7946C42.1246 52.5033 41.7065 52.3623 41.1567 52.3623" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.7588 53.9365C42.7588 53.4432 42.6366 53.0673 42.397 52.8042" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.7266 59.2217C30.9944 59.5318 31.4219 59.6868 31.9904 59.6868" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.3882 58.1133C30.3882 58.5596 30.4868 58.9073 30.6795 59.161" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.7589 58.1133C42.7589 59.1798 42.1951 59.6826 41.1567 59.6826" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.9805 51.0752H40.1518" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M29.3828 52.6489V56.8305" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M29.3828 52.6492C29.3828 51.5779 29.9466 51.0752 30.9803 51.0752" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M41.2941 51.4229C41.0262 51.1927 40.641 51.0752 40.1523 51.0752" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M29.3828 56.8306C29.3828 57.1923 29.4486 57.4883 29.5707 57.7233" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M30.7261 59.2223L30.6838 59.1612L29.6079 57.7939" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.3977 52.8041L42.393 52.7947L41.3594 51.4839" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20.7476 34.7759H29.2141" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.7588 34.7759H49.4728" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.085 13.8633H29.2758" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M42.7588 13.8633H49.4728" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20.7476 55.6885H29.2141" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M43.0225 55.6885H51.2353" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M56.1545 19.6141C55.102 16.3534 52.875 13.8633 49.478 13.8633" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M49.4736 34.7765C53.1478 34.7765 55.45 31.8728 56.385 28.2222" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.8545 40.5267C14.9116 37.266 17.134 34.7759 20.5309 34.7759" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20.5315 55.6888C16.8573 55.6888 14.5551 52.7852 13.6248 49.1345C13.6248 49.1298 13.6248 49.1204 13.6201 49.1157" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M51.3716 51.1831V60.1947" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M51.3716 51.1831L57.1976 55.6889" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M51.3716 60.1943L57.1976 55.6885" stroke="#003C73" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js
index 01ebb00b288c..aebd0f5d4864 100644
--- a/docs/assets/js/main.js
+++ b/docs/assets/js/main.js
@@ -58,10 +58,10 @@ function navigateBack() {
         return;
     }
 
-    const hubs = JSON.parse(document.getElementById('hubs-data').value);
-    const hubToNavigate = hubs.find((hub) => window.location.pathname.includes(hub)); // eslint-disable-line rulesdir/prefer-underscore-method
-    if (hubToNavigate) {
-        window.location.href = `/hubs/${hubToNavigate}`;
+    // Path name is of the form /articles/[platform]/[hub]/[resource]
+    const path = window.location.pathname.split('/');
+    if (path[2] && path[3]) {
+        window.location.href = `/${path[2]}/hubs/${path[3]}`;
     } else {
         window.location.href = '/';
     }
@@ -206,13 +206,6 @@ window.addEventListener('DOMContentLoaded', () => {
 
             // If there is a fixed article scroll container, set to calculate titles' offset
             scrollContainer: 'content-area',
-
-            // onclick function to apply to all links in toc. will be called with
-            // the event as the first parameter, and this can be used to stop,
-            // propagation, prevent default or perform action
-            onClick() {
-                toggleHeaderMenu();
-            },
         });
     }
 
@@ -226,6 +219,18 @@ window.addEventListener('DOMContentLoaded', () => {
 
     const articleContent = document.getElementById('article-content');
     const lhnContent = document.getElementById('lhn-content');
+
+    // This event listener checks if a link clicked in the LHN points to some section of the same page and toggles
+    // the LHN menu in responsive view.
+    lhnContent.addEventListener('click', (event) => {
+        const clickedLink = event.target;
+        if (clickedLink) {
+            const href = clickedLink.getAttribute('href');
+            if (href && href.startsWith('#') && !!document.getElementById(href.slice(1))) {
+                toggleHeaderMenu();
+            }
+        }
+    });
     lhnContent.addEventListener('wheel', (e) => {
         const scrollTop = lhnContent.scrollTop;
         const isScrollingPastLHNTop = e.deltaY < 0 && scrollTop === 0;
diff --git a/docs/expensify-classic/hubs/account-settings/index.html b/docs/expensify-classic/hubs/account-settings/index.html
new file mode 100644
index 000000000000..434761a6c4fa
--- /dev/null
+++ b/docs/expensify-classic/hubs/account-settings/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Account Settings
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/expensify-classic/hubs/bank-accounts-and-credit-cards/business-bank-accounts.html b/docs/expensify-classic/hubs/bank-accounts-and-credit-cards/business-bank-accounts.html
new file mode 100644
index 000000000000..86641ee60b7d
--- /dev/null
+++ b/docs/expensify-classic/hubs/bank-accounts-and-credit-cards/business-bank-accounts.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{% include section.html %}
diff --git a/docs/expensify-classic/hubs/bank-accounts-and-credit-cards/company-cards.html b/docs/expensify-classic/hubs/bank-accounts-and-credit-cards/company-cards.html
new file mode 100644
index 000000000000..86641ee60b7d
--- /dev/null
+++ b/docs/expensify-classic/hubs/bank-accounts-and-credit-cards/company-cards.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{% include section.html %}
diff --git a/docs/expensify-classic/hubs/bank-accounts-and-credit-cards/deposit-accounts.html b/docs/expensify-classic/hubs/bank-accounts-and-credit-cards/deposit-accounts.html
new file mode 100644
index 000000000000..86641ee60b7d
--- /dev/null
+++ b/docs/expensify-classic/hubs/bank-accounts-and-credit-cards/deposit-accounts.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{% include section.html %}
diff --git a/docs/expensify-classic/hubs/bank-accounts-and-credit-cards/index.html b/docs/expensify-classic/hubs/bank-accounts-and-credit-cards/index.html
new file mode 100644
index 000000000000..2f91f0913d6e
--- /dev/null
+++ b/docs/expensify-classic/hubs/bank-accounts-and-credit-cards/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Bank Accounts & Credit Cards
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/expensify-classic/hubs/billing-and-subscriptions/index.html b/docs/expensify-classic/hubs/billing-and-subscriptions/index.html
new file mode 100644
index 000000000000..05dc38835b51
--- /dev/null
+++ b/docs/expensify-classic/hubs/billing-and-subscriptions/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Billing & Subscriptions
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/expensify-classic/hubs/expense-and-report-features/index.html b/docs/expensify-classic/hubs/expense-and-report-features/index.html
new file mode 100644
index 000000000000..44afa4b18b51
--- /dev/null
+++ b/docs/expensify-classic/hubs/expense-and-report-features/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Expense & Report Settings
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/expensify-classic/hubs/expensify-card/index.html b/docs/expensify-classic/hubs/expensify-card/index.html
new file mode 100644
index 000000000000..3afd8ac662e7
--- /dev/null
+++ b/docs/expensify-classic/hubs/expensify-card/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Expensify Card
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/expensify-classic/hubs/exports/index.html b/docs/expensify-classic/hubs/exports/index.html
new file mode 100644
index 000000000000..16c96cb51d01
--- /dev/null
+++ b/docs/expensify-classic/hubs/exports/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Exports
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/expensify-classic/hubs/get-paid-back/expenses.html b/docs/expensify-classic/hubs/get-paid-back/expenses.html
new file mode 100644
index 000000000000..86641ee60b7d
--- /dev/null
+++ b/docs/expensify-classic/hubs/get-paid-back/expenses.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{% include section.html %}
diff --git a/docs/expensify-classic/hubs/get-paid-back/index.html b/docs/expensify-classic/hubs/get-paid-back/index.html
new file mode 100644
index 000000000000..1f84c1510b92
--- /dev/null
+++ b/docs/expensify-classic/hubs/get-paid-back/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Get Paid Back
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/expensify-classic/hubs/get-paid-back/reports.html b/docs/expensify-classic/hubs/get-paid-back/reports.html
new file mode 100644
index 000000000000..86641ee60b7d
--- /dev/null
+++ b/docs/expensify-classic/hubs/get-paid-back/reports.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{% include section.html %}
diff --git a/docs/expensify-classic/hubs/getting-started/approved-accountants.html b/docs/expensify-classic/hubs/getting-started/approved-accountants.html
new file mode 100644
index 000000000000..86641ee60b7d
--- /dev/null
+++ b/docs/expensify-classic/hubs/getting-started/approved-accountants.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{% include section.html %}
diff --git a/docs/expensify-classic/hubs/getting-started/index.html b/docs/expensify-classic/hubs/getting-started/index.html
new file mode 100644
index 000000000000..14ca13d0c2e8
--- /dev/null
+++ b/docs/expensify-classic/hubs/getting-started/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Getting Started
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/expensify-classic/hubs/getting-started/playbooks.html b/docs/expensify-classic/hubs/getting-started/playbooks.html
new file mode 100644
index 000000000000..86641ee60b7d
--- /dev/null
+++ b/docs/expensify-classic/hubs/getting-started/playbooks.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{% include section.html %}
diff --git a/docs/expensify-classic/hubs/getting-started/support.html b/docs/expensify-classic/hubs/getting-started/support.html
new file mode 100644
index 000000000000..86641ee60b7d
--- /dev/null
+++ b/docs/expensify-classic/hubs/getting-started/support.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{% include section.html %}
diff --git a/docs/expensify-classic/hubs/getting-started/tips-and-tricks.html b/docs/expensify-classic/hubs/getting-started/tips-and-tricks.html
new file mode 100644
index 000000000000..86641ee60b7d
--- /dev/null
+++ b/docs/expensify-classic/hubs/getting-started/tips-and-tricks.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{% include section.html %}
diff --git a/docs/expensify-classic/hubs/index.html b/docs/expensify-classic/hubs/index.html
new file mode 100644
index 000000000000..05c7b52bfa2d
--- /dev/null
+++ b/docs/expensify-classic/hubs/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Expensify Classic
+---
+
+{% include platform.html %}
\ No newline at end of file
diff --git a/docs/expensify-classic/hubs/integrations/HR-integrations.html b/docs/expensify-classic/hubs/integrations/HR-integrations.html
new file mode 100644
index 000000000000..86641ee60b7d
--- /dev/null
+++ b/docs/expensify-classic/hubs/integrations/HR-integrations.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{% include section.html %}
diff --git a/docs/expensify-classic/hubs/integrations/accounting-integrations.html b/docs/expensify-classic/hubs/integrations/accounting-integrations.html
new file mode 100644
index 000000000000..86641ee60b7d
--- /dev/null
+++ b/docs/expensify-classic/hubs/integrations/accounting-integrations.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{% include section.html %}
diff --git a/docs/expensify-classic/hubs/integrations/index.html b/docs/expensify-classic/hubs/integrations/index.html
new file mode 100644
index 000000000000..d1f173534c8a
--- /dev/null
+++ b/docs/expensify-classic/hubs/integrations/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Integrations
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/expensify-classic/hubs/integrations/other-integrations.html b/docs/expensify-classic/hubs/integrations/other-integrations.html
new file mode 100644
index 000000000000..86641ee60b7d
--- /dev/null
+++ b/docs/expensify-classic/hubs/integrations/other-integrations.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{% include section.html %}
diff --git a/docs/expensify-classic/hubs/integrations/travel-integrations.html b/docs/expensify-classic/hubs/integrations/travel-integrations.html
new file mode 100644
index 000000000000..86641ee60b7d
--- /dev/null
+++ b/docs/expensify-classic/hubs/integrations/travel-integrations.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{% include section.html %}
diff --git a/docs/expensify-classic/hubs/manage-employees-and-report-approvals/index.html b/docs/expensify-classic/hubs/manage-employees-and-report-approvals/index.html
new file mode 100644
index 000000000000..788e445ebc91
--- /dev/null
+++ b/docs/expensify-classic/hubs/manage-employees-and-report-approvals/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Manage Employees And Report Approvals
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/expensify-classic/hubs/policy-and-domain-settings/index.html b/docs/expensify-classic/hubs/policy-and-domain-settings/index.html
new file mode 100644
index 000000000000..ffd514fcb6fa
--- /dev/null
+++ b/docs/expensify-classic/hubs/policy-and-domain-settings/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Policy And Domain Settings
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/expensify-classic/hubs/policy-and-domain-settings/reports.html b/docs/expensify-classic/hubs/policy-and-domain-settings/reports.html
new file mode 100644
index 000000000000..86641ee60b7d
--- /dev/null
+++ b/docs/expensify-classic/hubs/policy-and-domain-settings/reports.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{% include section.html %}
diff --git a/docs/expensify-classic/hubs/send-payments/index.html b/docs/expensify-classic/hubs/send-payments/index.html
new file mode 100644
index 000000000000..c8275af5c353
--- /dev/null
+++ b/docs/expensify-classic/hubs/send-payments/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Send Payments
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/hubs/other.html b/docs/hubs/other.html
deleted file mode 100644
index 7d6d7f204062..000000000000
--- a/docs/hubs/other.html
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: default
-title: Other
----
-
-{% include hub.html %}
diff --git a/docs/hubs/playbooks.html b/docs/hubs/playbooks.html
deleted file mode 100644
index 0f15922fd061..000000000000
--- a/docs/hubs/playbooks.html
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: default
-title: Playbooks
----
-
-{% include hub.html %}
diff --git a/docs/hubs/request-money.html b/docs/hubs/request-money.html
deleted file mode 100644
index e3ef68f5c050..000000000000
--- a/docs/hubs/request-money.html
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: default
-title: Request money
----
-
-{% include hub.html %}
diff --git a/docs/hubs/split-bills.html b/docs/hubs/split-bills.html
deleted file mode 100644
index 6464ab62ef07..000000000000
--- a/docs/hubs/split-bills.html
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: default
-title: Split bills
----
-
-{% include hub.html %}
diff --git a/docs/index.html b/docs/index.html
index 74296c200971..70bd5f31545a 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -6,15 +6,11 @@ <h1 class="title">{{ site.data.routes.home.title }}</h1>
 
     <p>{{ site.data.routes.home.description }}</p>
 
-    <h2>
-        Which best describes how you use Expensify?
-    </h2>
-
     <div class="cards-group">
-        {% include hub-card.html href="split-bills" %}
-        {% include hub-card.html href="request-money" %}
-        {% include hub-card.html href="playbooks" %}
-        {% include hub-card.html href="other" %}
+        {% for platform in site.data.routes.platforms %}
+            {% assign platform_href = platform.href %}
+            {% include platform-card.html href=platform.platform_href %}
+        {% endfor %}
     </div>
 
     <div class="cards-group">
diff --git a/docs/new-expensify/hubs/account-settings/index.html b/docs/new-expensify/hubs/account-settings/index.html
new file mode 100644
index 000000000000..434761a6c4fa
--- /dev/null
+++ b/docs/new-expensify/hubs/account-settings/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Account Settings
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/new-expensify/hubs/bank-accounts-and-credit-cards/index.html b/docs/new-expensify/hubs/bank-accounts-and-credit-cards/index.html
new file mode 100644
index 000000000000..2f91f0913d6e
--- /dev/null
+++ b/docs/new-expensify/hubs/bank-accounts-and-credit-cards/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Bank Accounts & Credit Cards
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/new-expensify/hubs/billing-and-plan-types/index.html b/docs/new-expensify/hubs/billing-and-plan-types/index.html
new file mode 100644
index 000000000000..b49b2b62b1d6
--- /dev/null
+++ b/docs/new-expensify/hubs/billing-and-plan-types/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Billing & Plan Types
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/new-expensify/hubs/expense-and-report-features/index.html b/docs/new-expensify/hubs/expense-and-report-features/index.html
new file mode 100644
index 000000000000..0057ae0fa46c
--- /dev/null
+++ b/docs/new-expensify/hubs/expense-and-report-features/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Expense and Report Features
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/new-expensify/hubs/expensify-card/index.html b/docs/new-expensify/hubs/expensify-card/index.html
new file mode 100644
index 000000000000..3afd8ac662e7
--- /dev/null
+++ b/docs/new-expensify/hubs/expensify-card/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Expensify Card
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/new-expensify/hubs/exports/index.html b/docs/new-expensify/hubs/exports/index.html
new file mode 100644
index 000000000000..16c96cb51d01
--- /dev/null
+++ b/docs/new-expensify/hubs/exports/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Exports
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/new-expensify/hubs/get-paid-back/index.html b/docs/new-expensify/hubs/get-paid-back/index.html
new file mode 100644
index 000000000000..1f84c1510b92
--- /dev/null
+++ b/docs/new-expensify/hubs/get-paid-back/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Get Paid Back
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/new-expensify/hubs/getting-started/chat.html b/docs/new-expensify/hubs/getting-started/chat.html
new file mode 100644
index 000000000000..86641ee60b7d
--- /dev/null
+++ b/docs/new-expensify/hubs/getting-started/chat.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{% include section.html %}
diff --git a/docs/new-expensify/hubs/getting-started/index.html b/docs/new-expensify/hubs/getting-started/index.html
new file mode 100644
index 000000000000..14ca13d0c2e8
--- /dev/null
+++ b/docs/new-expensify/hubs/getting-started/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Getting Started
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/new-expensify/hubs/index.html b/docs/new-expensify/hubs/index.html
new file mode 100644
index 000000000000..de046b16e755
--- /dev/null
+++ b/docs/new-expensify/hubs/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: New Expensify
+---
+
+{% include platform.html %}
\ No newline at end of file
diff --git a/docs/new-expensify/hubs/integrations/accounting-integrations.html b/docs/new-expensify/hubs/integrations/accounting-integrations.html
new file mode 100644
index 000000000000..86641ee60b7d
--- /dev/null
+++ b/docs/new-expensify/hubs/integrations/accounting-integrations.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{% include section.html %}
diff --git a/docs/new-expensify/hubs/integrations/index.html b/docs/new-expensify/hubs/integrations/index.html
new file mode 100644
index 000000000000..d1f173534c8a
--- /dev/null
+++ b/docs/new-expensify/hubs/integrations/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Integrations
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/new-expensify/hubs/manage-employees-and-report-approvals/index.html b/docs/new-expensify/hubs/manage-employees-and-report-approvals/index.html
new file mode 100644
index 000000000000..31e992f32d5d
--- /dev/null
+++ b/docs/new-expensify/hubs/manage-employees-and-report-approvals/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Manage Employees & Report Approvals
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/new-expensify/hubs/send-payments/index.html b/docs/new-expensify/hubs/send-payments/index.html
new file mode 100644
index 000000000000..c8275af5c353
--- /dev/null
+++ b/docs/new-expensify/hubs/send-payments/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Send Payments
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/docs/new-expensify/hubs/workspace-and-domain-settings/index.html b/docs/new-expensify/hubs/workspace-and-domain-settings/index.html
new file mode 100644
index 000000000000..c4e5d06d6b8a
--- /dev/null
+++ b/docs/new-expensify/hubs/workspace-and-domain-settings/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Workspace & Domain Settings
+---
+
+{% include hub.html %}
\ No newline at end of file
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index ecec05f1cec1..dac53193fdc6 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -17,7 +17,7 @@ platform :android do
   desc "Generate a new local APK for e2e testing"
   lane :build_e2e do
     ENV["ENVFILE"]="tests/e2e/.env.e2e"
-    ENV["ENTRY_FILE"]="#{Dir.pwd}/../src/libs/E2E/reactNativeLaunchingTest.js"
+    ENV["ENTRY_FILE"]="src/libs/E2E/reactNativeLaunchingTest.js"
     ENV["E2E_TESTING"]="true"
 
     gradle(
@@ -67,6 +67,8 @@ platform :android do
   desc "Build and upload app to Google Play"
   lane :beta do
     ENV["ENVFILE"]=".env.production"
+    # Google is very unreliable, so we retry a few times
+    ENV["SUPPLY_UPLOAD_MAX_RETRIES"]="5"
 
     gradle(
         project_dir: './android',
@@ -86,6 +88,8 @@ platform :android do
 
   desc "Deploy app to Google Play production"
   lane :production do
+    # Google is very unreliable, so we retry a few times
+    ENV["SUPPLY_UPLOAD_MAX_RETRIES"]="5"
     google_play_track_version_codes(
       package_name: "com.expensify.chat",
       json_key: './android/app/android-fastlane-json-key.json',
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 00b380a7d1dc..c16c6dce16ca 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.67</string>
+	<string>1.3.75</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.67.2</string>
+	<string>1.3.75.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 031ce55e7518..21803f251753 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.67</string>
+	<string>1.3.75</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.67.2</string>
+	<string>1.3.75.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..ba53d939e46c 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -31,14 +31,14 @@ PODS:
     - React-Core
   - CocoaAsyncSocket (7.6.5)
   - DoubleConversion (1.1.6)
-  - FBLazyVector (0.72.3)
-  - FBReactNativeSpec (0.72.3):
+  - FBLazyVector (0.72.4)
+  - FBReactNativeSpec (0.72.4):
     - RCT-Folly (= 2021.07.22.00)
-    - RCTRequired (= 0.72.3)
-    - RCTTypeSafety (= 0.72.3)
-    - React-Core (= 0.72.3)
-    - React-jsi (= 0.72.3)
-    - ReactCommon/turbomodule/core (= 0.72.3)
+    - RCTRequired (= 0.72.4)
+    - RCTTypeSafety (= 0.72.4)
+    - React-Core (= 0.72.4)
+    - React-jsi (= 0.72.4)
+    - ReactCommon/turbomodule/core (= 0.72.4)
   - Firebase/Analytics (8.8.0):
     - Firebase/Core
   - Firebase/Core (8.8.0):
@@ -220,9 +220,9 @@ PODS:
     - AppAuth/Core (~> 1.6)
     - GTMSessionFetcher/Core (< 4.0, >= 1.5)
   - GTMSessionFetcher/Core (3.1.1)
-  - hermes-engine (0.72.3):
-    - hermes-engine/Pre-built (= 0.72.3)
-  - hermes-engine/Pre-built (0.72.3)
+  - hermes-engine (0.72.4):
+    - hermes-engine/Pre-built (= 0.72.4)
+  - hermes-engine/Pre-built (0.72.4)
   - libevent (2.1.12)
   - libwebp (1.2.4):
     - libwebp/demux (= 1.2.4)
@@ -283,26 +283,26 @@ PODS:
     - fmt (~> 6.2.1)
     - glog
     - libevent
-  - RCTRequired (0.72.3)
-  - RCTTypeSafety (0.72.3):
-    - FBLazyVector (= 0.72.3)
-    - RCTRequired (= 0.72.3)
-    - React-Core (= 0.72.3)
-  - React (0.72.3):
-    - React-Core (= 0.72.3)
-    - React-Core/DevSupport (= 0.72.3)
-    - React-Core/RCTWebSocket (= 0.72.3)
-    - React-RCTActionSheet (= 0.72.3)
-    - React-RCTAnimation (= 0.72.3)
-    - React-RCTBlob (= 0.72.3)
-    - React-RCTImage (= 0.72.3)
-    - React-RCTLinking (= 0.72.3)
-    - React-RCTNetwork (= 0.72.3)
-    - React-RCTSettings (= 0.72.3)
-    - React-RCTText (= 0.72.3)
-    - React-RCTVibration (= 0.72.3)
-  - React-callinvoker (0.72.3)
-  - React-Codegen (0.72.3):
+  - RCTRequired (0.72.4)
+  - RCTTypeSafety (0.72.4):
+    - FBLazyVector (= 0.72.4)
+    - RCTRequired (= 0.72.4)
+    - React-Core (= 0.72.4)
+  - React (0.72.4):
+    - React-Core (= 0.72.4)
+    - React-Core/DevSupport (= 0.72.4)
+    - React-Core/RCTWebSocket (= 0.72.4)
+    - React-RCTActionSheet (= 0.72.4)
+    - React-RCTAnimation (= 0.72.4)
+    - React-RCTBlob (= 0.72.4)
+    - React-RCTImage (= 0.72.4)
+    - React-RCTLinking (= 0.72.4)
+    - React-RCTNetwork (= 0.72.4)
+    - React-RCTSettings (= 0.72.4)
+    - React-RCTText (= 0.72.4)
+    - React-RCTVibration (= 0.72.4)
+  - React-callinvoker (0.72.4)
+  - React-Codegen (0.72.4):
     - DoubleConversion
     - FBReactNativeSpec
     - glog
@@ -317,11 +317,11 @@ PODS:
     - React-rncore
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-  - React-Core (0.72.3):
+  - React-Core (0.72.4):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.72.3)
+    - React-Core/Default (= 0.72.4)
     - React-cxxreact
     - React-hermes
     - React-jsi
@@ -331,7 +331,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/CoreModulesHeaders (0.72.3):
+  - React-Core/CoreModulesHeaders (0.72.4):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -345,7 +345,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/Default (0.72.3):
+  - React-Core/Default (0.72.4):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -358,23 +358,23 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/DevSupport (0.72.3):
+  - React-Core/DevSupport (0.72.4):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.72.3)
-    - React-Core/RCTWebSocket (= 0.72.3)
+    - React-Core/Default (= 0.72.4)
+    - React-Core/RCTWebSocket (= 0.72.4)
     - React-cxxreact
     - React-hermes
     - React-jsi
     - React-jsiexecutor
-    - React-jsinspector (= 0.72.3)
+    - React-jsinspector (= 0.72.4)
     - React-perflogger
     - React-runtimeexecutor
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTActionSheetHeaders (0.72.3):
+  - React-Core/RCTActionSheetHeaders (0.72.4):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -388,7 +388,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTAnimationHeaders (0.72.3):
+  - React-Core/RCTAnimationHeaders (0.72.4):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -402,7 +402,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTBlobHeaders (0.72.3):
+  - React-Core/RCTBlobHeaders (0.72.4):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -416,7 +416,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTImageHeaders (0.72.3):
+  - React-Core/RCTImageHeaders (0.72.4):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -430,7 +430,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTLinkingHeaders (0.72.3):
+  - React-Core/RCTLinkingHeaders (0.72.4):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -444,7 +444,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTNetworkHeaders (0.72.3):
+  - React-Core/RCTNetworkHeaders (0.72.4):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -458,7 +458,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTSettingsHeaders (0.72.3):
+  - React-Core/RCTSettingsHeaders (0.72.4):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -472,7 +472,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTTextHeaders (0.72.3):
+  - React-Core/RCTTextHeaders (0.72.4):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -486,7 +486,7 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTVibrationHeaders (0.72.3):
+  - React-Core/RCTVibrationHeaders (0.72.4):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -500,11 +500,11 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-Core/RCTWebSocket (0.72.3):
+  - React-Core/RCTWebSocket (0.72.4):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.72.3)
+    - React-Core/Default (= 0.72.4)
     - React-cxxreact
     - React-hermes
     - React-jsi
@@ -514,57 +514,57 @@ PODS:
     - React-utils
     - SocketRocket (= 0.6.1)
     - Yoga
-  - React-CoreModules (0.72.3):
+  - React-CoreModules (0.72.4):
     - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.72.3)
-    - React-Codegen (= 0.72.3)
-    - React-Core/CoreModulesHeaders (= 0.72.3)
-    - React-jsi (= 0.72.3)
+    - RCTTypeSafety (= 0.72.4)
+    - React-Codegen (= 0.72.4)
+    - React-Core/CoreModulesHeaders (= 0.72.4)
+    - React-jsi (= 0.72.4)
     - React-RCTBlob
-    - React-RCTImage (= 0.72.3)
-    - ReactCommon/turbomodule/core (= 0.72.3)
+    - React-RCTImage (= 0.72.4)
+    - ReactCommon/turbomodule/core (= 0.72.4)
     - SocketRocket (= 0.6.1)
-  - React-cxxreact (0.72.3):
+  - React-cxxreact (0.72.4):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 0.72.3)
-    - React-debug (= 0.72.3)
-    - React-jsi (= 0.72.3)
-    - React-jsinspector (= 0.72.3)
-    - React-logger (= 0.72.3)
-    - React-perflogger (= 0.72.3)
-    - React-runtimeexecutor (= 0.72.3)
-  - React-debug (0.72.3)
-  - React-hermes (0.72.3):
+    - React-callinvoker (= 0.72.4)
+    - React-debug (= 0.72.4)
+    - React-jsi (= 0.72.4)
+    - React-jsinspector (= 0.72.4)
+    - React-logger (= 0.72.4)
+    - React-perflogger (= 0.72.4)
+    - React-runtimeexecutor (= 0.72.4)
+  - React-debug (0.72.4)
+  - React-hermes (0.72.4):
     - DoubleConversion
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
     - RCT-Folly/Futures (= 2021.07.22.00)
-    - React-cxxreact (= 0.72.3)
+    - React-cxxreact (= 0.72.4)
     - React-jsi
-    - React-jsiexecutor (= 0.72.3)
-    - React-jsinspector (= 0.72.3)
-    - React-perflogger (= 0.72.3)
-  - React-jsi (0.72.3):
+    - React-jsiexecutor (= 0.72.4)
+    - React-jsinspector (= 0.72.4)
+    - React-perflogger (= 0.72.4)
+  - React-jsi (0.72.4):
     - boost (= 1.76.0)
     - DoubleConversion
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
-  - React-jsiexecutor (0.72.3):
+  - React-jsiexecutor (0.72.4):
     - DoubleConversion
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
-    - React-cxxreact (= 0.72.3)
-    - React-jsi (= 0.72.3)
-    - React-perflogger (= 0.72.3)
-  - React-jsinspector (0.72.3)
-  - React-logger (0.72.3):
+    - React-cxxreact (= 0.72.4)
+    - React-jsi (= 0.72.4)
+    - React-perflogger (= 0.72.4)
+  - React-jsinspector (0.72.4)
+  - React-logger (0.72.4):
     - glog
   - react-native-airship (15.2.6):
     - AirshipFrameworkProxy (= 2.0.8)
@@ -593,7 +593,7 @@ PODS:
     - React-Core
   - react-native-pdf (6.7.1):
     - React-Core
-  - react-native-performance (4.0.0):
+  - react-native-performance (5.1.0):
     - React-Core
   - react-native-plaid-link-sdk (10.0.0):
     - Plaid (~> 4.1.0)
@@ -614,7 +614,7 @@ PODS:
     - React-Core
   - react-native-webview (11.23.0):
     - React-Core
-  - React-NativeModulesApple (0.72.3):
+  - React-NativeModulesApple (0.72.4):
     - hermes-engine
     - React-callinvoker
     - React-Core
@@ -623,17 +623,17 @@ PODS:
     - React-runtimeexecutor
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-  - React-perflogger (0.72.3)
-  - React-RCTActionSheet (0.72.3):
-    - React-Core/RCTActionSheetHeaders (= 0.72.3)
-  - React-RCTAnimation (0.72.3):
+  - React-perflogger (0.72.4)
+  - React-RCTActionSheet (0.72.4):
+    - React-Core/RCTActionSheetHeaders (= 0.72.4)
+  - React-RCTAnimation (0.72.4):
     - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.72.3)
-    - React-Codegen (= 0.72.3)
-    - React-Core/RCTAnimationHeaders (= 0.72.3)
-    - React-jsi (= 0.72.3)
-    - ReactCommon/turbomodule/core (= 0.72.3)
-  - React-RCTAppDelegate (0.72.3):
+    - RCTTypeSafety (= 0.72.4)
+    - React-Codegen (= 0.72.4)
+    - React-Core/RCTAnimationHeaders (= 0.72.4)
+    - React-jsi (= 0.72.4)
+    - ReactCommon/turbomodule/core (= 0.72.4)
+  - React-RCTAppDelegate (0.72.4):
     - RCT-Folly
     - RCTRequired
     - RCTTypeSafety
@@ -645,54 +645,54 @@ PODS:
     - React-RCTNetwork
     - React-runtimescheduler
     - ReactCommon/turbomodule/core
-  - React-RCTBlob (0.72.3):
+  - React-RCTBlob (0.72.4):
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
-    - React-Codegen (= 0.72.3)
-    - React-Core/RCTBlobHeaders (= 0.72.3)
-    - React-Core/RCTWebSocket (= 0.72.3)
-    - React-jsi (= 0.72.3)
-    - React-RCTNetwork (= 0.72.3)
-    - ReactCommon/turbomodule/core (= 0.72.3)
-  - React-RCTImage (0.72.3):
+    - React-Codegen (= 0.72.4)
+    - React-Core/RCTBlobHeaders (= 0.72.4)
+    - React-Core/RCTWebSocket (= 0.72.4)
+    - React-jsi (= 0.72.4)
+    - React-RCTNetwork (= 0.72.4)
+    - ReactCommon/turbomodule/core (= 0.72.4)
+  - React-RCTImage (0.72.4):
     - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.72.3)
-    - React-Codegen (= 0.72.3)
-    - React-Core/RCTImageHeaders (= 0.72.3)
-    - React-jsi (= 0.72.3)
-    - React-RCTNetwork (= 0.72.3)
-    - ReactCommon/turbomodule/core (= 0.72.3)
-  - React-RCTLinking (0.72.3):
-    - React-Codegen (= 0.72.3)
-    - React-Core/RCTLinkingHeaders (= 0.72.3)
-    - React-jsi (= 0.72.3)
-    - ReactCommon/turbomodule/core (= 0.72.3)
-  - React-RCTNetwork (0.72.3):
+    - RCTTypeSafety (= 0.72.4)
+    - React-Codegen (= 0.72.4)
+    - React-Core/RCTImageHeaders (= 0.72.4)
+    - React-jsi (= 0.72.4)
+    - React-RCTNetwork (= 0.72.4)
+    - ReactCommon/turbomodule/core (= 0.72.4)
+  - React-RCTLinking (0.72.4):
+    - React-Codegen (= 0.72.4)
+    - React-Core/RCTLinkingHeaders (= 0.72.4)
+    - React-jsi (= 0.72.4)
+    - ReactCommon/turbomodule/core (= 0.72.4)
+  - React-RCTNetwork (0.72.4):
     - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.72.3)
-    - React-Codegen (= 0.72.3)
-    - React-Core/RCTNetworkHeaders (= 0.72.3)
-    - React-jsi (= 0.72.3)
-    - ReactCommon/turbomodule/core (= 0.72.3)
-  - React-RCTSettings (0.72.3):
+    - RCTTypeSafety (= 0.72.4)
+    - React-Codegen (= 0.72.4)
+    - React-Core/RCTNetworkHeaders (= 0.72.4)
+    - React-jsi (= 0.72.4)
+    - ReactCommon/turbomodule/core (= 0.72.4)
+  - React-RCTSettings (0.72.4):
     - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.72.3)
-    - React-Codegen (= 0.72.3)
-    - React-Core/RCTSettingsHeaders (= 0.72.3)
-    - React-jsi (= 0.72.3)
-    - ReactCommon/turbomodule/core (= 0.72.3)
-  - React-RCTText (0.72.3):
-    - React-Core/RCTTextHeaders (= 0.72.3)
-  - React-RCTVibration (0.72.3):
+    - RCTTypeSafety (= 0.72.4)
+    - React-Codegen (= 0.72.4)
+    - React-Core/RCTSettingsHeaders (= 0.72.4)
+    - React-jsi (= 0.72.4)
+    - ReactCommon/turbomodule/core (= 0.72.4)
+  - React-RCTText (0.72.4):
+    - React-Core/RCTTextHeaders (= 0.72.4)
+  - React-RCTVibration (0.72.4):
     - RCT-Folly (= 2021.07.22.00)
-    - React-Codegen (= 0.72.3)
-    - React-Core/RCTVibrationHeaders (= 0.72.3)
-    - React-jsi (= 0.72.3)
-    - ReactCommon/turbomodule/core (= 0.72.3)
-  - React-rncore (0.72.3)
-  - React-runtimeexecutor (0.72.3):
-    - React-jsi (= 0.72.3)
-  - React-runtimescheduler (0.72.3):
+    - React-Codegen (= 0.72.4)
+    - React-Core/RCTVibrationHeaders (= 0.72.4)
+    - React-jsi (= 0.72.4)
+    - ReactCommon/turbomodule/core (= 0.72.4)
+  - React-rncore (0.72.4)
+  - React-runtimeexecutor (0.72.4):
+    - React-jsi (= 0.72.4)
+  - React-runtimescheduler (0.72.4):
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
@@ -700,30 +700,30 @@ PODS:
     - React-debug
     - React-jsi
     - React-runtimeexecutor
-  - React-utils (0.72.3):
+  - React-utils (0.72.4):
     - glog
     - RCT-Folly (= 2021.07.22.00)
     - React-debug
-  - ReactCommon/turbomodule/bridging (0.72.3):
+  - ReactCommon/turbomodule/bridging (0.72.4):
     - DoubleConversion
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 0.72.3)
-    - React-cxxreact (= 0.72.3)
-    - React-jsi (= 0.72.3)
-    - React-logger (= 0.72.3)
-    - React-perflogger (= 0.72.3)
-  - ReactCommon/turbomodule/core (0.72.3):
+    - React-callinvoker (= 0.72.4)
+    - React-cxxreact (= 0.72.4)
+    - React-jsi (= 0.72.4)
+    - React-logger (= 0.72.4)
+    - React-perflogger (= 0.72.4)
+  - ReactCommon/turbomodule/core (0.72.4):
     - DoubleConversion
     - glog
     - hermes-engine
     - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 0.72.3)
-    - React-cxxreact (= 0.72.3)
-    - React-jsi (= 0.72.3)
-    - React-logger (= 0.72.3)
-    - React-perflogger (= 0.72.3)
+    - React-callinvoker (= 0.72.4)
+    - React-cxxreact (= 0.72.4)
+    - React-jsi (= 0.72.4)
+    - React-logger (= 0.72.4)
+    - React-perflogger (= 0.72.4)
   - RNAppleAuthentication (2.2.2):
     - React-Core
   - RNCAsyncStorage (1.17.11):
@@ -783,7 +783,7 @@ PODS:
     - React-Core
   - RNReactNativeHapticFeedback (1.14.0):
     - React-Core
-  - RNReanimated (3.4.0):
+  - RNReanimated (3.5.4):
     - DoubleConversion
     - FBLazyVector
     - glog
@@ -815,7 +815,7 @@ PODS:
   - RNScreens (3.21.0):
     - React-Core
     - React-RCTImage
-  - RNSVG (13.9.0):
+  - RNSVG (13.13.0):
     - React-Core
   - SDWebImage (5.11.1):
     - SDWebImage/Core (= 5.11.1)
@@ -1010,7 +1010,7 @@ EXTERNAL SOURCES:
     :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
   hermes-engine:
     :podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec"
-    :tag: hermes-2023-03-20-RNv0.72.0-49794cfc7c81fb8f69fd60c3bbf85a7480cc5a77
+    :tag: hermes-2023-08-07-RNv0.72.4-813b2def12bc9df02654b3e3653ae4a68d0572e0
   lottie-react-native:
     :path: "../node_modules/lottie-react-native"
   onfido-react-native-sdk:
@@ -1182,8 +1182,8 @@ SPEC CHECKSUMS:
   BVLinearGradient: 421743791a59d259aec53f4c58793aad031da2ca
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
-  FBLazyVector: 4cce221dd782d3ff7c4172167bba09d58af67ccb
-  FBReactNativeSpec: c6bd9e179757b3c0ecf815864fae8032377903ef
+  FBLazyVector: 5d4a3b7f411219a45a6d952f77d2c0a6c9989da5
+  FBReactNativeSpec: 3fc2d478e1c4b08276f9dd9128f80ec6d5d85c1f
   Firebase: 629510f1a9ddb235f3a7c5c8ceb23ba887f0f814
   FirebaseABTesting: 10cbce8db9985ae2e3847ea44e9947dd18f94e10
   FirebaseAnalytics: 5506ea8b867d8423485a84b4cd612d279f7b0b8a
@@ -1209,7 +1209,7 @@ SPEC CHECKSUMS:
   GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749
   GTMAppAuth: 99fb010047ba3973b7026e45393f51f27ab965ae
   GTMSessionFetcher: e8647203b65cee28c5f73d0f473d096653945e72
-  hermes-engine: 10fbd3f62405c41ea07e71973ea61e1878d07322
+  hermes-engine: 81191603c4eaa01f5e4ae5737a9efcf64756c7b2
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
   lottie-ios: 8f97d3271e155c2d688875c29cd3c74908aef5f8
@@ -1229,20 +1229,20 @@ SPEC CHECKSUMS:
   Plaid: 7d340abeadb46c7aa1a91f896c5b22395a31fcf2
   PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
   RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
-  RCTRequired: a2faf4bad4e438ca37b2040cb8f7799baa065c18
-  RCTTypeSafety: cb09f3e4747b6d18331a15eb05271de7441ca0b3
-  React: 13109005b5353095c052f26af37413340ccf7a5d
-  React-callinvoker: c8c87bce983aa499c13cb06d4447c025a35274d6
-  React-Codegen: 712d523524d89d71f1cf7cc624854941be983c4d
-  React-Core: 688f88b7f3a3d30b4848036223f8b07102c687e5
-  React-CoreModules: 63c063a3ade8fb3b1bec5fd9a50f17b0421558c6
-  React-cxxreact: 37765b4975541105b2a3322a4b473417c158c869
-  React-debug: 51f11ef8db14b47f24e71c42a4916d4192972156
-  React-hermes: 935ae71fb3d7654e947beba8498835cd5e479707
-  React-jsi: ec628dc7a15ffea969f237b0ea6d2fde212b19dd
-  React-jsiexecutor: 59d1eb03af7d30b7d66589c410f13151271e8006
-  React-jsinspector: b511447170f561157547bc0bef3f169663860be7
-  React-logger: c5b527272d5f22eaa09bb3c3a690fee8f237ae95
+  RCTRequired: c0569ecc035894e4a68baecb30fe6a7ea6e399f9
+  RCTTypeSafety: e90354072c21236e0bcf1699011e39acd25fea2f
+  React: a1be3c6dc0a6e949ccd3e659781aa47bbae1868f
+  React-callinvoker: 1020b33f6cb1a1824f9ca2a86609fbce2a73c6ed
+  React-Codegen: a0a26badf098d4a779acda922caf74f6ecabed28
+  React-Core: 52075b80f10c26f62219d7b5d13d7d8089f027b3
+  React-CoreModules: 21abab85d7ad9038ce2b1c33d39e3baaf7dc9244
+  React-cxxreact: 4ad1cc861e32fb533dad6ff7a4ea25680fa1c994
+  React-debug: 17366a3d5c5d2f5fc04f09101a4af38cb42b54ae
+  React-hermes: 37377d0a56aa0cf55c65248271866ce3268cde3f
+  React-jsi: 6de8b0ccc6b765b58e4eee9ee38049dbeaf5c221
+  React-jsiexecutor: c7f826e40fa9cab5d37cab6130b1af237332b594
+  React-jsinspector: aaed4cf551c4a1c98092436518c2d267b13a673f
+  React-logger: da1ebe05ae06eb6db4b162202faeafac4b435e77
   react-native-airship: 5d19f4ba303481cf4101ff9dee9249ef6a8a6b64
   react-native-blob-util: 99f4d79189252f597fe0d810c57a3733b1b1dea6
   react-native-cameraroll: 8ffb0af7a5e5de225fd667610e2979fc1f0c2151
@@ -1255,30 +1255,30 @@ SPEC CHECKSUMS:
   react-native-netinfo: ccbe1085dffd16592791d550189772e13bf479e2
   react-native-pager-view: 0ccb8bf60e2ebd38b1f3669fa3650ecce81db2df
   react-native-pdf: 7c0e91ada997bac8bac3bb5bea5b6b81f5a3caae
-  react-native-performance: 224bd53e6a835fda4353302cf891d088a0af7406
+  react-native-performance: cef2b618d47b277fb5c3280b81a3aad1e72f2886
   react-native-plaid-link-sdk: 9eb0f71dad94b3bdde649c7a384cba93024af46c
   react-native-quick-sqlite: bcc7a7a250a40222f18913a97cd356bf82d0a6c4
   react-native-render-html: 96c979fe7452a0a41559685d2f83b12b93edac8c
   react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a
   react-native-view-shot: 705f999ac2a24e4e6c909c0ca65c732ed33ca2ff
   react-native-webview: e771bc375f789ebfa02a26939a57dbc6fa897336
-  React-NativeModulesApple: c57f3efe0df288a6532b726ad2d0322a9bf38472
-  React-perflogger: 6bd153e776e6beed54c56b0847e1220a3ff92ba5
-  React-RCTActionSheet: c0b62af44e610e69d9a2049a682f5dba4e9dff17
-  React-RCTAnimation: f9bf9719258926aea9ecb8a2aa2595d3ff9a6022
-  React-RCTAppDelegate: e5ac35d4dbd1fae7df3a62b47db04b6a8d151592
-  React-RCTBlob: c4f1e69a6ef739aa42586b876d637dab4e3b5bed
-  React-RCTImage: e5798f01aba248416c02a506cf5e6dfcba827638
-  React-RCTLinking: f5b6227c879e33206f34e68924c458f57bbb96d9
-  React-RCTNetwork: d5554fbfac1c618da3c8fa29933108ea22837788
-  React-RCTSettings: 189c71e3e6146ba59f4f7e2cbeb494cf2ad42afa
-  React-RCTText: 19425aea9d8b6ccae55a27916355b17ab577e56e
-  React-RCTVibration: 388ac0e1455420895d1ca2548401eed964b038a6
-  React-rncore: 755a331dd67b74662108f2d66a384454bf8dc1a1
-  React-runtimeexecutor: 369ae9bb3f83b65201c0c8f7d50b72280b5a1dbc
-  React-runtimescheduler: 837c1bebd2f84572db17698cd702ceaf585b0d9a
-  React-utils: bcb57da67eec2711f8b353f6e3d33bd8e4b2efa3
-  ReactCommon: 3ccb8fb14e6b3277e38c73b0ff5e4a1b8db017a9
+  React-NativeModulesApple: edb5ace14f73f4969df6e7b1f3e41bef0012740f
+  React-perflogger: 496a1a3dc6737f964107cb3ddae7f9e265ddda58
+  React-RCTActionSheet: 02904b932b50e680f4e26e7a686b33ebf7ef3c00
+  React-RCTAnimation: 88feaf0a85648fb8fd497ce749829774910276d6
+  React-RCTAppDelegate: 5792ac0f0feccb584765fdd7aa81ea320c4d9b0b
+  React-RCTBlob: 0dbc9e2a13d241b37d46b53e54630cbad1f0e141
+  React-RCTImage: b111645ab901f8e59fc68fbe31f5731bdbeef087
+  React-RCTLinking: 3d719727b4c098aad3588aa3559361ee0579f5de
+  React-RCTNetwork: b44d3580be05d74556ba4efbf53570f17e38f734
+  React-RCTSettings: c0c54b330442c29874cd4dae6e94190dc11a6f6f
+  React-RCTText: 9b9f5589d9b649d7246c3f336e116496df28cfe6
+  React-RCTVibration: 691c67f3beaf1d084ceed5eb5c1dddd9afa8591e
+  React-rncore: 142268f6c92e296dc079aadda3fade778562f9e4
+  React-runtimeexecutor: d465ba0c47ef3ed8281143f59605cacc2244d5c7
+  React-runtimescheduler: 4941cc1b3cf08b792fbf666342c9fc95f1969035
+  React-utils: b79f2411931f9d3ea5781404dcbb2fa8a837e13a
+  ReactCommon: 4b2bdcb50a3543e1c2b2849ad44533686610826d
   RNAppleAuthentication: 0571c08da8c327ae2afc0261b48b4a515b0286a6
   RNCAsyncStorage: 8616bd5a58af409453ea4e1b246521bb76578d60
   RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
@@ -1298,17 +1298,17 @@ SPEC CHECKSUMS:
   rnmapbox-maps: 6f638ec002aa6e906a6f766d69cd45f968d98e64
   RNPermissions: dcdb7b99796bbeda6975a6e79ad519c41b251b1c
   RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c
-  RNReanimated: 020859659f64be2d30849a1fe88c821a7c3e0cbf
+  RNReanimated: ab2e96c6d5591c3dfbb38a464f54c8d17fb34a87
   RNScreens: d037903436160a4b039d32606668350d2a808806
-  RNSVG: 53c661b76829783cdaf9b7a57258f3d3b4c28315
+  RNSVG: ed492aaf3af9ca01bc945f7a149d76d62e73ec82
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Turf: 469ce2c3d22e5e8e4818d5a3b254699a5c89efa4
   VisionCamera: d3ec8883417a6a4a0e3a6ba37d81d22db7611601
-  Yoga: 8796b55dba14d7004f980b54bcc9833ee45b28ce
+  Yoga: 3efc43e0d48686ce2e8c60f99d4e6bd349aff981
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 845537d35601574adcd0794e17003ba7dbccdbfd
+PODFILE CHECKSUM: 2daf34c870819a933f3fefe426801d54b2ff2a14
 
 COCOAPODS: 1.12.1
diff --git a/jest.config.js b/jest.config.js
index 1f540a679b9a..6cf44b6b3695 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -23,6 +23,6 @@ module.exports = {
     },
     testEnvironment: 'jsdom',
     setupFiles: ['<rootDir>/jest/setup.js', './node_modules/@react-native-google-signin/google-signin/jest/build/setup.js'],
-    setupFilesAfterEnv: ['@testing-library/jest-native/extend-expect'],
+    setupFilesAfterEnv: ['@testing-library/jest-native/extend-expect', '<rootDir>/jest/setupAfterEnv.js'],
     cacheDirectory: '<rootDir>/.jest-cache',
 };
diff --git a/jest/setupAfterEnv.js b/jest/setupAfterEnv.js
new file mode 100644
index 000000000000..6f7836b64dbb
--- /dev/null
+++ b/jest/setupAfterEnv.js
@@ -0,0 +1 @@
+jest.useRealTimers();
diff --git a/package-lock.json b/package-lock.json
index cd763dffefbe..8ab673766f6f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,17 @@
 {
   "name": "new.expensify",
-  "version": "1.3.67-2",
+  "version": "1.3.75-3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.67-2",
+      "version": "1.3.75-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",
@@ -46,7 +50,7 @@
         "date-fns-tz": "^2.0.0",
         "dom-serializer": "^0.2.2",
         "domhandler": "^4.3.0",
-        "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#e63d06e239fe5b2f221e86eab71ae8a4e3b8bee3",
+        "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#1609f1848cc0c2528064519c3ea48b4953a708ee",
         "fbjs": "^3.0.2",
         "htmlparser2": "^7.2.0",
         "idb-keyval": "^6.2.1",
@@ -60,13 +64,14 @@
         "patch-package": "^8.0.0",
         "process": "^0.11.10",
         "prop-types": "^15.7.2",
-        "pusher-js": "7.4.0",
+        "pusher-js": "8.3.0",
         "react": "18.2.0",
         "react-collapse": "^5.1.0",
         "react-content-loader": "^6.1.0",
         "react-dom": "18.1.0",
+        "react-error-boundary": "^4.0.11",
         "react-map-gl": "^7.1.3",
-        "react-native": "0.72.3",
+        "react-native": "0.72.4",
         "react-native-blob-util": "^0.17.3",
         "react-native-collapsible": "^1.6.0",
         "react-native-config": "^1.4.5",
@@ -76,7 +81,7 @@
         "react-native-fast-image": "^8.6.3",
         "react-native-fs": "^2.20.0",
         "react-native-gesture-handler": "2.12.0",
-        "react-native-google-places-autocomplete": "git+https://github.com/Expensify/react-native-google-places-autocomplete.git#ee87343c3e827ff7818abc71b6bb04fcc1f120e0",
+        "react-native-google-places-autocomplete": "git+https://github.com/Expensify/react-native-google-places-autocomplete.git#cef3ac29d9501091453136e1219e24c4ec9f9d76",
         "react-native-haptic-feedback": "^1.13.0",
         "react-native-image-pan-zoom": "^2.1.12",
         "react-native-image-picker": "^5.1.0",
@@ -85,20 +90,20 @@
         "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.97",
         "react-native-pager-view": "^6.2.0",
         "react-native-pdf": "^6.7.1",
-        "react-native-performance": "^4.0.0",
+        "react-native-performance": "^5.1.0",
         "react-native-permissions": "^3.0.1",
         "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#eae05855286dc699954415cc1d629bfd8e8e47e2",
         "react-native-plaid-link-sdk": "^10.0.0",
         "react-native-qrcode-svg": "^6.2.0",
         "react-native-quick-sqlite": "^8.0.0-beta.2",
-        "react-native-reanimated": "3.4.0",
+        "react-native-reanimated": "3.5.4",
         "react-native-render-html": "6.3.1",
         "react-native-safe-area-context": "4.4.1",
         "react-native-screens": "3.21.0",
-        "react-native-svg": "^13.9.0",
+        "react-native-svg": "^13.13.0",
         "react-native-tab-view": "^3.5.2",
         "react-native-url-polyfill": "^2.0.0",
         "react-native-view-shot": "^3.6.0",
@@ -128,11 +133,13 @@
         "@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",
         "@react-native-community/eslint-config": "3.0.0",
-        "@react-native/metro-config": "^0.72.9",
+        "@react-native/metro-config": "^0.72.11",
         "@react-navigation/devtools": "^6.0.10",
         "@storybook/addon-a11y": "^6.5.9",
         "@storybook/addon-essentials": "^7.0.0",
@@ -179,11 +186,11 @@
         "css-loader": "^6.7.2",
         "diff-so-fancy": "^1.3.0",
         "dotenv": "^16.0.3",
-        "electron": "^25.8.0",
-        "electron-builder": "24.5.0",
+        "electron": "^25.8.1",
+        "electron-builder": "24.6.4",
         "eslint": "^7.6.0",
         "eslint-config-airbnb-typescript": "^17.1.0",
-        "eslint-config-expensify": "^2.0.38",
+        "eslint-config-expensify": "^2.0.39",
         "eslint-config-prettier": "^8.8.0",
         "eslint-plugin-jest": "^24.1.0",
         "eslint-plugin-jsdoc": "^46.2.6",
@@ -197,7 +204,7 @@
         "jest-circus": "29.4.1",
         "jest-cli": "29.4.1",
         "jest-environment-jsdom": "^29.4.1",
-        "metro-react-native-babel-preset": "0.76.7",
+        "metro-react-native-babel-preset": "0.76.8",
         "mock-fs": "^4.13.0",
         "onchange": "^7.1.0",
         "portfinder": "^1.0.28",
@@ -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",
@@ -1769,10 +1777,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-assign": {
-      "version": "7.18.6",
-      "license": "MIT",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.22.5.tgz",
+      "integrity": "sha512-iDhx9ARkXq4vhZ2CYOSnQXkmxkDgosLi3J8Z17mKz7LyzthtkdVchLD7WZ3aXeCuvJDOW3+1I5TpJmwIbF9MKQ==",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2953,9 +2962,9 @@
       }
     },
     "node_modules/@electron/osx-sign": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.0.4.tgz",
-      "integrity": "sha512-xfhdEcIOfAZg7scZ9RQPya1G1lWo8/zMCwUXAulq0SfY7ONIW+b9qGyKdMyuMctNYwllrIS+vmxfijSfjeh97g==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.0.5.tgz",
+      "integrity": "sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==",
       "dev": true,
       "dependencies": {
         "compare-version": "^0.1.2",
@@ -2999,171 +3008,10 @@
         "url": "https://github.com/sponsors/gjtorikian/"
       }
     },
-    "node_modules/@electron/rebuild": {
-      "version": "3.2.13",
-      "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.2.13.tgz",
-      "integrity": "sha512-DH9Ol4JCnHDYVOD0fKWq+Qqbn/0WU1O6QR0mIpMXEVU4YFM4PlaqNC9K36mGShNBxxGFotZCMDrB1wl/iHM12g==",
-      "dev": true,
-      "dependencies": {
-        "@malept/cross-spawn-promise": "^2.0.0",
-        "chalk": "^4.0.0",
-        "debug": "^4.1.1",
-        "detect-libc": "^2.0.1",
-        "fs-extra": "^10.0.0",
-        "got": "^11.7.0",
-        "node-abi": "^3.0.0",
-        "node-api-version": "^0.1.4",
-        "node-gyp": "^9.0.0",
-        "ora": "^5.1.0",
-        "semver": "^7.3.5",
-        "tar": "^6.0.5",
-        "yargs": "^17.0.1"
-      },
-      "bin": {
-        "electron-rebuild": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=12.13.0"
-      }
-    },
-    "node_modules/@electron/rebuild/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@electron/rebuild/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@electron/rebuild/node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@electron/rebuild/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@electron/rebuild/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@electron/rebuild/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@electron/rebuild/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@electron/rebuild/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@electron/rebuild/node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@electron/rebuild/node_modules/yargs": {
-      "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@electron/rebuild/node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@electron/universal": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.3.4.tgz",
-      "integrity": "sha512-BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.4.1.tgz",
+      "integrity": "sha512-lE/U3UNw1YHuowNbTmKNs9UlS3En3cPgwM5MI+agIgr/B1hSze9NdOP0qn7boZaI9Lph8IDv3/24g9IxnJP7aQ==",
       "dev": true,
       "dependencies": {
         "@electron/asar": "^3.2.1",
@@ -3178,28 +3026,6 @@
         "node": ">=8.6"
       }
     },
-    "node_modules/@electron/universal/node_modules/@malept/cross-spawn-promise": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz",
-      "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/malept"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund"
-        }
-      ],
-      "dependencies": {
-        "cross-spawn": "^7.0.1"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/@emotion/use-insertion-effect-with-fallbacks": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz",
@@ -3871,6 +3697,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",
@@ -5376,6 +5229,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",
@@ -5412,9 +5369,9 @@
       }
     },
     "node_modules/@malept/cross-spawn-promise": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz",
-      "integrity": "sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz",
+      "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==",
       "dev": true,
       "funding": [
         {
@@ -5430,7 +5387,7 @@
         "cross-spawn": "^7.0.1"
       },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">= 10"
       }
     },
     "node_modules/@malept/flatpak-bundler": {
@@ -5882,6 +5839,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,
@@ -6764,19 +6727,19 @@
       }
     },
     "node_modules/@react-native-community/cli": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-11.3.5.tgz",
-      "integrity": "sha512-wMXgKEWe6uesw7vyXKKjx5EDRog0QdXHxdgRguG14AjQRao1+4gXEWq2yyExOTi/GDY6dfJBUGTCwGQxhnk/Lg==",
-      "dependencies": {
-        "@react-native-community/cli-clean": "11.3.5",
-        "@react-native-community/cli-config": "11.3.5",
-        "@react-native-community/cli-debugger-ui": "11.3.5",
-        "@react-native-community/cli-doctor": "11.3.5",
-        "@react-native-community/cli-hermes": "11.3.5",
-        "@react-native-community/cli-plugin-metro": "11.3.5",
-        "@react-native-community/cli-server-api": "11.3.5",
-        "@react-native-community/cli-tools": "11.3.5",
-        "@react-native-community/cli-types": "11.3.5",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-11.3.6.tgz",
+      "integrity": "sha512-bdwOIYTBVQ9VK34dsf6t3u6vOUU5lfdhKaAxiAVArjsr7Je88Bgs4sAbsOYsNK3tkE8G77U6wLpekknXcanlww==",
+      "dependencies": {
+        "@react-native-community/cli-clean": "11.3.6",
+        "@react-native-community/cli-config": "11.3.6",
+        "@react-native-community/cli-debugger-ui": "11.3.6",
+        "@react-native-community/cli-doctor": "11.3.6",
+        "@react-native-community/cli-hermes": "11.3.6",
+        "@react-native-community/cli-plugin-metro": "11.3.6",
+        "@react-native-community/cli-server-api": "11.3.6",
+        "@react-native-community/cli-tools": "11.3.6",
+        "@react-native-community/cli-types": "11.3.6",
         "chalk": "^4.1.2",
         "commander": "^9.4.1",
         "execa": "^5.0.0",
@@ -6784,7 +6747,7 @@
         "fs-extra": "^8.1.0",
         "graceful-fs": "^4.1.3",
         "prompts": "^2.4.0",
-        "semver": "^6.3.0"
+        "semver": "^7.5.2"
       },
       "bin": {
         "react-native": "build/bin.js"
@@ -6794,11 +6757,11 @@
       }
     },
     "node_modules/@react-native-community/cli-clean": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-clean/-/cli-clean-11.3.5.tgz",
-      "integrity": "sha512-1+7BU962wKkIkHRp/uW3jYbQKKGtU7L+R3g59D8K6uLccuxJYUBJv18753ojMa6SD3SAq5Xh31bAre+YwVcOTA==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-clean/-/cli-clean-11.3.6.tgz",
+      "integrity": "sha512-jOOaeG5ebSXTHweq1NznVJVAFKtTFWL4lWgUXl845bCGX7t1lL8xQNWHKwT8Oh1pGR2CI3cKmRjY4hBg+pEI9g==",
       "dependencies": {
-        "@react-native-community/cli-tools": "11.3.5",
+        "@react-native-community/cli-tools": "11.3.6",
         "chalk": "^4.1.2",
         "execa": "^5.0.0",
         "prompts": "^2.4.0"
@@ -6869,11 +6832,11 @@
       }
     },
     "node_modules/@react-native-community/cli-config": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-config/-/cli-config-11.3.5.tgz",
-      "integrity": "sha512-fMblIsHlUleKfGsgWyjFJYfx1SqrsnhS/QXfA8w7iT6GrNOOjBp5UWx8+xlMDFcmOb9e42g1ExFDKl3n8FWkxQ==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-config/-/cli-config-11.3.6.tgz",
+      "integrity": "sha512-edy7fwllSFLan/6BG6/rznOBCLPrjmJAE10FzkEqNLHowi0bckiAPg1+1jlgQ2qqAxV5kuk+c9eajVfQvPLYDA==",
       "dependencies": {
-        "@react-native-community/cli-tools": "11.3.5",
+        "@react-native-community/cli-tools": "11.3.6",
         "chalk": "^4.1.2",
         "cosmiconfig": "^5.1.0",
         "deepmerge": "^4.3.0",
@@ -6992,22 +6955,22 @@
       }
     },
     "node_modules/@react-native-community/cli-debugger-ui": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-11.3.5.tgz",
-      "integrity": "sha512-o5JVCKEpPUXMX4r3p1cYjiy3FgdOEkezZcQ6owWEae2dYvV19lLYyJwnocm9Y7aG9PvpgI3PIMVh3KZbhS21eA==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-11.3.6.tgz",
+      "integrity": "sha512-jhMOSN/iOlid9jn/A2/uf7HbC3u7+lGktpeGSLnHNw21iahFBzcpuO71ekEdlmTZ4zC/WyxBXw9j2ka33T358w==",
       "dependencies": {
         "serve-static": "^1.13.1"
       }
     },
     "node_modules/@react-native-community/cli-doctor": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-doctor/-/cli-doctor-11.3.5.tgz",
-      "integrity": "sha512-+4BuFHjoV4FFjX5y60l0s6nS0agidb1izTVwsFixeFKW73LUkOLu+Ae5HI94RAFEPE4ePEVNgYX3FynIau6K0g==",
-      "dependencies": {
-        "@react-native-community/cli-config": "11.3.5",
-        "@react-native-community/cli-platform-android": "11.3.5",
-        "@react-native-community/cli-platform-ios": "11.3.5",
-        "@react-native-community/cli-tools": "11.3.5",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-doctor/-/cli-doctor-11.3.6.tgz",
+      "integrity": "sha512-UT/Tt6omVPi1j6JEX+CObc85eVFghSZwy4GR9JFMsO7gNg2Tvcu1RGWlUkrbmWMAMHw127LUu6TGK66Ugu1NLA==",
+      "dependencies": {
+        "@react-native-community/cli-config": "11.3.6",
+        "@react-native-community/cli-platform-android": "11.3.6",
+        "@react-native-community/cli-platform-ios": "11.3.6",
+        "@react-native-community/cli-tools": "11.3.6",
         "chalk": "^4.1.2",
         "command-exists": "^1.2.8",
         "envinfo": "^7.7.2",
@@ -7017,7 +6980,7 @@
         "node-stream-zip": "^1.9.1",
         "ora": "^5.4.1",
         "prompts": "^2.4.0",
-        "semver": "^6.3.0",
+        "semver": "^7.5.2",
         "strip-ansi": "^5.2.0",
         "sudo-prompt": "^9.0.0",
         "wcwidth": "^1.0.1",
@@ -7082,14 +7045,6 @@
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
       "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="
     },
-    "node_modules/@react-native-community/cli-doctor/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/@react-native-community/cli-doctor/node_modules/strip-ansi": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -7112,21 +7067,13 @@
         "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",
-      "integrity": "sha512-+3m34hiaJpFel8BlJE7kJOaPzWR/8U8APZG2LXojbAdBAg99EGmQcwXIgsSVJFvH8h/nezf4DHbsPKigIe33zA==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-hermes/-/cli-hermes-11.3.6.tgz",
+      "integrity": "sha512-O55YAYGZ3XynpUdePPVvNuUPGPY0IJdctLAOHme73OvS80gNwfntHDXfmY70TGHWIfkK2zBhA0B+2v8s5aTyTA==",
       "dependencies": {
-        "@react-native-community/cli-platform-android": "11.3.5",
-        "@react-native-community/cli-tools": "11.3.5",
+        "@react-native-community/cli-platform-android": "11.3.6",
+        "@react-native-community/cli-tools": "11.3.6",
         "chalk": "^4.1.2",
         "hermes-profile-transformer": "^0.0.6",
         "ip": "^1.1.5"
@@ -7202,11 +7149,11 @@
       }
     },
     "node_modules/@react-native-community/cli-platform-android": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-android/-/cli-platform-android-11.3.5.tgz",
-      "integrity": "sha512-s4Lj7FKxJ/BofGi/ifjPfrA9MjFwIgYpHnHBSlqtbsvPoSYzmVCU2qlWM8fb3AmkXIwyYt4A6MEr3MmNT2UoBg==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-android/-/cli-platform-android-11.3.6.tgz",
+      "integrity": "sha512-ZARrpLv5tn3rmhZc//IuDM1LSAdYnjUmjrp58RynlvjLDI4ZEjBAGCQmgysRgXAsK7ekMrfkZgemUczfn9td2A==",
       "dependencies": {
-        "@react-native-community/cli-tools": "11.3.5",
+        "@react-native-community/cli-tools": "11.3.6",
         "chalk": "^4.1.2",
         "execa": "^5.0.0",
         "glob": "^7.1.3",
@@ -7278,11 +7225,11 @@
       }
     },
     "node_modules/@react-native-community/cli-platform-ios": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-ios/-/cli-platform-ios-11.3.5.tgz",
-      "integrity": "sha512-ytJC/YCFD7P+KuQHOT5Jzh1ho2XbJEjq71yHa1gJP2PG/Q/uB4h1x2XpxDqv5iXU6E250yjvKMmkReKTW4CTig==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-ios/-/cli-platform-ios-11.3.6.tgz",
+      "integrity": "sha512-tZ9VbXWiRW+F+fbZzpLMZlj93g3Q96HpuMsS6DRhrTiG+vMQ3o6oPWSEEmMGOvJSYU7+y68Dc9ms2liC7VD6cw==",
       "dependencies": {
-        "@react-native-community/cli-tools": "11.3.5",
+        "@react-native-community/cli-tools": "11.3.6",
         "chalk": "^4.1.2",
         "execa": "^5.0.0",
         "fast-xml-parser": "^4.0.12",
@@ -7355,12 +7302,12 @@
       }
     },
     "node_modules/@react-native-community/cli-plugin-metro": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-plugin-metro/-/cli-plugin-metro-11.3.5.tgz",
-      "integrity": "sha512-r9AekfeLKdblB7LfWB71IrNy1XM03WrByQlUQajUOZAP2NmUUBLl9pMZscPjJeOSgLpHB9ixEFTIOhTabri/qg==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-plugin-metro/-/cli-plugin-metro-11.3.6.tgz",
+      "integrity": "sha512-D97racrPX3069ibyabJNKw9aJpVcaZrkYiEzsEnx50uauQtPDoQ1ELb/5c6CtMhAEGKoZ0B5MS23BbsSZcLs2g==",
       "dependencies": {
-        "@react-native-community/cli-server-api": "11.3.5",
-        "@react-native-community/cli-tools": "11.3.5",
+        "@react-native-community/cli-server-api": "11.3.6",
+        "@react-native-community/cli-tools": "11.3.6",
         "chalk": "^4.1.2",
         "execa": "^5.0.0",
         "metro": "0.76.7",
@@ -7372,6 +7319,29 @@
         "readline": "^1.3.0"
       }
     },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/@jest/types": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/@types/yargs": {
+      "version": "16.0.5",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.5.tgz",
+      "integrity": "sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
     "node_modules/@react-native-community/cli-plugin-metro/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -7401,6 +7371,24 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@react-native-community/cli-plugin-metro/node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -7417,6 +7405,28 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/cosmiconfig": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+      "dependencies": {
+        "import-fresh": "^2.0.0",
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.13.1",
+        "parse-json": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
     "node_modules/@react-native-community/cli-plugin-metro/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -7425,6 +7435,492 @@
         "node": ">=8"
       }
     },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/import-fresh": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+      "integrity": "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==",
+      "dependencies": {
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/jest-regex-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
+      "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/jest-util": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+      "dependencies": {
+        "@jest/types": "^27.5.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/jest-util/node_modules/ci-info": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+      "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/metro": {
+      "version": "0.76.7",
+      "resolved": "https://registry.npmjs.org/metro/-/metro-0.76.7.tgz",
+      "integrity": "sha512-67ZGwDeumEPnrHI+pEDSKH2cx+C81Gx8Mn5qOtmGUPm/Up9Y4I1H2dJZ5n17MWzejNo0XAvPh0QL0CrlJEODVQ==",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/core": "^7.20.0",
+        "@babel/generator": "^7.20.0",
+        "@babel/parser": "^7.20.0",
+        "@babel/template": "^7.0.0",
+        "@babel/traverse": "^7.20.0",
+        "@babel/types": "^7.20.0",
+        "accepts": "^1.3.7",
+        "async": "^3.2.2",
+        "chalk": "^4.0.0",
+        "ci-info": "^2.0.0",
+        "connect": "^3.6.5",
+        "debug": "^2.2.0",
+        "denodeify": "^1.2.1",
+        "error-stack-parser": "^2.0.6",
+        "graceful-fs": "^4.2.4",
+        "hermes-parser": "0.12.0",
+        "image-size": "^1.0.2",
+        "invariant": "^2.2.4",
+        "jest-worker": "^27.2.0",
+        "jsc-safe-url": "^0.2.2",
+        "lodash.throttle": "^4.1.1",
+        "metro-babel-transformer": "0.76.7",
+        "metro-cache": "0.76.7",
+        "metro-cache-key": "0.76.7",
+        "metro-config": "0.76.7",
+        "metro-core": "0.76.7",
+        "metro-file-map": "0.76.7",
+        "metro-inspector-proxy": "0.76.7",
+        "metro-minify-terser": "0.76.7",
+        "metro-minify-uglify": "0.76.7",
+        "metro-react-native-babel-preset": "0.76.7",
+        "metro-resolver": "0.76.7",
+        "metro-runtime": "0.76.7",
+        "metro-source-map": "0.76.7",
+        "metro-symbolicate": "0.76.7",
+        "metro-transform-plugins": "0.76.7",
+        "metro-transform-worker": "0.76.7",
+        "mime-types": "^2.1.27",
+        "node-fetch": "^2.2.0",
+        "nullthrows": "^1.1.1",
+        "rimraf": "^3.0.2",
+        "serialize-error": "^2.1.0",
+        "source-map": "^0.5.6",
+        "strip-ansi": "^6.0.0",
+        "throat": "^5.0.0",
+        "ws": "^7.5.1",
+        "yargs": "^17.6.2"
+      },
+      "bin": {
+        "metro": "src/cli.js"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/metro-babel-transformer": {
+      "version": "0.76.7",
+      "resolved": "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.76.7.tgz",
+      "integrity": "sha512-bgr2OFn0J4r0qoZcHrwEvccF7g9k3wdgTOgk6gmGHrtlZ1Jn3oCpklW/DfZ9PzHfjY2mQammKTc19g/EFGyOJw==",
+      "dependencies": {
+        "@babel/core": "^7.20.0",
+        "hermes-parser": "0.12.0",
+        "nullthrows": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/metro-cache": {
+      "version": "0.76.7",
+      "resolved": "https://registry.npmjs.org/metro-cache/-/metro-cache-0.76.7.tgz",
+      "integrity": "sha512-nWBMztrs5RuSxZRI7hgFgob5PhYDmxICh9FF8anm9/ito0u0vpPvRxt7sRu8fyeD2AHdXqE7kX32rWY0LiXgeg==",
+      "dependencies": {
+        "metro-core": "0.76.7",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/metro-cache-key": {
+      "version": "0.76.7",
+      "resolved": "https://registry.npmjs.org/metro-cache-key/-/metro-cache-key-0.76.7.tgz",
+      "integrity": "sha512-0pecoIzwsD/Whn/Qfa+SDMX2YyasV0ndbcgUFx7w1Ct2sLHClujdhQ4ik6mvQmsaOcnGkIyN0zcceMDjC2+BFQ==",
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/metro-config": {
+      "version": "0.76.7",
+      "resolved": "https://registry.npmjs.org/metro-config/-/metro-config-0.76.7.tgz",
+      "integrity": "sha512-CFDyNb9bqxZemiChC/gNdXZ7OQkIwmXzkrEXivcXGbgzlt/b2juCv555GWJHyZSlorwnwJfY3uzAFu4A9iRVfg==",
+      "dependencies": {
+        "connect": "^3.6.5",
+        "cosmiconfig": "^5.0.5",
+        "jest-validate": "^29.2.1",
+        "metro": "0.76.7",
+        "metro-cache": "0.76.7",
+        "metro-core": "0.76.7",
+        "metro-runtime": "0.76.7"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/metro-core": {
+      "version": "0.76.7",
+      "resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.76.7.tgz",
+      "integrity": "sha512-0b8KfrwPmwCMW+1V7ZQPkTy2tsEKZjYG9Pu1PTsu463Z9fxX7WaR0fcHFshv+J1CnQSUTwIGGjbNvj1teKe+pw==",
+      "dependencies": {
+        "lodash.throttle": "^4.1.1",
+        "metro-resolver": "0.76.7"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/metro-file-map": {
+      "version": "0.76.7",
+      "resolved": "https://registry.npmjs.org/metro-file-map/-/metro-file-map-0.76.7.tgz",
+      "integrity": "sha512-s+zEkTcJ4mOJTgEE2ht4jIo1DZfeWreQR3tpT3gDV/Y/0UQ8aJBTv62dE775z0GLsWZApiblAYZsj7ZE8P06nw==",
+      "dependencies": {
+        "anymatch": "^3.0.3",
+        "debug": "^2.2.0",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.4",
+        "invariant": "^2.2.4",
+        "jest-regex-util": "^27.0.6",
+        "jest-util": "^27.2.0",
+        "jest-worker": "^27.2.0",
+        "micromatch": "^4.0.4",
+        "node-abort-controller": "^3.1.1",
+        "nullthrows": "^1.1.1",
+        "walker": "^1.0.7"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/metro-inspector-proxy": {
+      "version": "0.76.7",
+      "resolved": "https://registry.npmjs.org/metro-inspector-proxy/-/metro-inspector-proxy-0.76.7.tgz",
+      "integrity": "sha512-rNZ/6edTl/1qUekAhAbaFjczMphM50/UjtxiKulo6vqvgn/Mjd9hVqDvVYfAMZXqPvlusD88n38UjVYPkruLSg==",
+      "dependencies": {
+        "connect": "^3.6.5",
+        "debug": "^2.2.0",
+        "node-fetch": "^2.2.0",
+        "ws": "^7.5.1",
+        "yargs": "^17.6.2"
+      },
+      "bin": {
+        "metro-inspector-proxy": "src/cli.js"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/metro-minify-terser": {
+      "version": "0.76.7",
+      "resolved": "https://registry.npmjs.org/metro-minify-terser/-/metro-minify-terser-0.76.7.tgz",
+      "integrity": "sha512-FQiZGhIxCzhDwK4LxyPMLlq0Tsmla10X7BfNGlYFK0A5IsaVKNJbETyTzhpIwc+YFRT4GkFFwgo0V2N5vxO5HA==",
+      "dependencies": {
+        "terser": "^5.15.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/metro-minify-uglify": {
+      "version": "0.76.7",
+      "resolved": "https://registry.npmjs.org/metro-minify-uglify/-/metro-minify-uglify-0.76.7.tgz",
+      "integrity": "sha512-FuXIU3j2uNcSvQtPrAJjYWHruPiQ+EpE++J9Z+VznQKEHcIxMMoQZAfIF2IpZSrZYfLOjVFyGMvj41jQMxV1Vw==",
+      "dependencies": {
+        "uglify-es": "^3.1.9"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/metro-react-native-babel-preset": {
+      "version": "0.76.7",
+      "resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.76.7.tgz",
+      "integrity": "sha512-R25wq+VOSorAK3hc07NW0SmN8z9S/IR0Us0oGAsBcMZnsgkbOxu77Mduqf+f4is/wnWHc5+9bfiqdLnaMngiVw==",
+      "dependencies": {
+        "@babel/core": "^7.20.0",
+        "@babel/plugin-proposal-async-generator-functions": "^7.0.0",
+        "@babel/plugin-proposal-class-properties": "^7.18.0",
+        "@babel/plugin-proposal-export-default-from": "^7.0.0",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.0",
+        "@babel/plugin-proposal-numeric-separator": "^7.0.0",
+        "@babel/plugin-proposal-object-rest-spread": "^7.20.0",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
+        "@babel/plugin-proposal-optional-chaining": "^7.20.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.0",
+        "@babel/plugin-syntax-export-default-from": "^7.0.0",
+        "@babel/plugin-syntax-flow": "^7.18.0",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.0.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.0.0",
+        "@babel/plugin-transform-arrow-functions": "^7.0.0",
+        "@babel/plugin-transform-async-to-generator": "^7.20.0",
+        "@babel/plugin-transform-block-scoping": "^7.0.0",
+        "@babel/plugin-transform-classes": "^7.0.0",
+        "@babel/plugin-transform-computed-properties": "^7.0.0",
+        "@babel/plugin-transform-destructuring": "^7.20.0",
+        "@babel/plugin-transform-flow-strip-types": "^7.20.0",
+        "@babel/plugin-transform-function-name": "^7.0.0",
+        "@babel/plugin-transform-literals": "^7.0.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.0.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.0.0",
+        "@babel/plugin-transform-parameters": "^7.0.0",
+        "@babel/plugin-transform-react-display-name": "^7.0.0",
+        "@babel/plugin-transform-react-jsx": "^7.0.0",
+        "@babel/plugin-transform-react-jsx-self": "^7.0.0",
+        "@babel/plugin-transform-react-jsx-source": "^7.0.0",
+        "@babel/plugin-transform-runtime": "^7.0.0",
+        "@babel/plugin-transform-shorthand-properties": "^7.0.0",
+        "@babel/plugin-transform-spread": "^7.0.0",
+        "@babel/plugin-transform-sticky-regex": "^7.0.0",
+        "@babel/plugin-transform-typescript": "^7.5.0",
+        "@babel/plugin-transform-unicode-regex": "^7.0.0",
+        "@babel/template": "^7.0.0",
+        "babel-plugin-transform-flow-enums": "^0.0.2",
+        "react-refresh": "^0.4.0"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "@babel/core": "*"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/metro-react-native-babel-transformer": {
+      "version": "0.76.7",
+      "resolved": "https://registry.npmjs.org/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.76.7.tgz",
+      "integrity": "sha512-W6lW3J7y/05ph3c2p3KKJNhH0IdyxdOCbQ5it7aM2MAl0SM4wgKjaV6EYv9b3rHklpV6K3qMH37UKVcjMooWiA==",
+      "dependencies": {
+        "@babel/core": "^7.20.0",
+        "babel-preset-fbjs": "^3.4.0",
+        "hermes-parser": "0.12.0",
+        "metro-react-native-babel-preset": "0.76.7",
+        "nullthrows": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "@babel/core": "*"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/metro-resolver": {
+      "version": "0.76.7",
+      "resolved": "https://registry.npmjs.org/metro-resolver/-/metro-resolver-0.76.7.tgz",
+      "integrity": "sha512-pC0Wgq29HHIHrwz23xxiNgylhI8Rq1V01kQaJ9Kz11zWrIdlrH0ZdnJ7GC6qA0ErROG+cXmJ0rJb8/SW1Zp2IA==",
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/metro-runtime": {
+      "version": "0.76.7",
+      "resolved": "https://registry.npmjs.org/metro-runtime/-/metro-runtime-0.76.7.tgz",
+      "integrity": "sha512-MuWHubQHymUWBpZLwuKZQgA/qbb35WnDAKPo83rk7JRLIFPvzXSvFaC18voPuzJBt1V98lKQIonh6MiC9gd8Ug==",
+      "dependencies": {
+        "@babel/runtime": "^7.0.0",
+        "react-refresh": "^0.4.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/metro-source-map": {
+      "version": "0.76.7",
+      "resolved": "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.76.7.tgz",
+      "integrity": "sha512-Prhx7PeRV1LuogT0Kn5VjCuFu9fVD68eefntdWabrksmNY6mXK8pRqzvNJOhTojh6nek+RxBzZeD6MIOOyXS6w==",
+      "dependencies": {
+        "@babel/traverse": "^7.20.0",
+        "@babel/types": "^7.20.0",
+        "invariant": "^2.2.4",
+        "metro-symbolicate": "0.76.7",
+        "nullthrows": "^1.1.1",
+        "ob1": "0.76.7",
+        "source-map": "^0.5.6",
+        "vlq": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/metro-symbolicate": {
+      "version": "0.76.7",
+      "resolved": "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.76.7.tgz",
+      "integrity": "sha512-p0zWEME5qLSL1bJb93iq+zt5fz3sfVn9xFYzca1TJIpY5MommEaS64Va87lp56O0sfEIvh4307Oaf/ZzRjuLiQ==",
+      "dependencies": {
+        "invariant": "^2.2.4",
+        "metro-source-map": "0.76.7",
+        "nullthrows": "^1.1.1",
+        "source-map": "^0.5.6",
+        "through2": "^2.0.1",
+        "vlq": "^1.0.0"
+      },
+      "bin": {
+        "metro-symbolicate": "src/index.js"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/metro-transform-plugins": {
+      "version": "0.76.7",
+      "resolved": "https://registry.npmjs.org/metro-transform-plugins/-/metro-transform-plugins-0.76.7.tgz",
+      "integrity": "sha512-iSmnjVApbdivjuzb88Orb0JHvcEt5veVyFAzxiS5h0QB+zV79w6JCSqZlHCrbNOkOKBED//LqtKbFVakxllnNg==",
+      "dependencies": {
+        "@babel/core": "^7.20.0",
+        "@babel/generator": "^7.20.0",
+        "@babel/template": "^7.0.0",
+        "@babel/traverse": "^7.20.0",
+        "nullthrows": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/metro-transform-worker": {
+      "version": "0.76.7",
+      "resolved": "https://registry.npmjs.org/metro-transform-worker/-/metro-transform-worker-0.76.7.tgz",
+      "integrity": "sha512-cGvELqFMVk9XTC15CMVzrCzcO6sO1lURfcbgjuuPdzaWuD11eEyocvkTX0DPiRjsvgAmicz4XYxVzgYl3MykDw==",
+      "dependencies": {
+        "@babel/core": "^7.20.0",
+        "@babel/generator": "^7.20.0",
+        "@babel/parser": "^7.20.0",
+        "@babel/types": "^7.20.0",
+        "babel-preset-fbjs": "^3.4.0",
+        "metro": "0.76.7",
+        "metro-babel-transformer": "0.76.7",
+        "metro-cache": "0.76.7",
+        "metro-cache-key": "0.76.7",
+        "metro-source-map": "0.76.7",
+        "metro-transform-plugins": "0.76.7",
+        "nullthrows": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/ob1": {
+      "version": "0.76.7",
+      "resolved": "https://registry.npmjs.org/ob1/-/ob1-0.76.7.tgz",
+      "integrity": "sha512-BQdRtxxoUNfSoZxqeBGOyuT9nEYSn18xZHwGMb0mMVpn2NBcYbnyKY4BK2LIHRgw33CBGlUmE+KMaNvyTpLLtQ==",
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+      "dependencies": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/react-refresh": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.3.tgz",
+      "integrity": "sha512-Hwln1VNuGl/6bVwnd0Xdn1e84gT/8T9aYNL+HAKDArLCS7LWjwr7StE30IEYbIkx0Vi3vs+coQxe+SQDbGbbpA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/serialize-error": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz",
+      "integrity": "sha512-ghgmKt5o4Tly5yEG/UJp8qTd0AN7Xalw4XBtDEKP655B699qMEtra1WlXeE6WIvdEG481JvRxULKsInq/iNysw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@react-native-community/cli-plugin-metro/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -7436,13 +7932,66 @@
         "node": ">=8"
       }
     },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/ws": {
+      "version": "7.5.9",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@react-native-community/cli-plugin-metro/node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@react-native-community/cli-server-api": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-server-api/-/cli-server-api-11.3.5.tgz",
-      "integrity": "sha512-PM/jF13uD1eAKuC84lntNuM5ZvJAtyb+H896P1dBIXa9boPLa3KejfUvNVoyOUJ5s8Ht25JKbc3yieV2+GMBDA==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-server-api/-/cli-server-api-11.3.6.tgz",
+      "integrity": "sha512-8GUKodPnURGtJ9JKg8yOHIRtWepPciI3ssXVw5jik7+dZ43yN8P5BqCoDaq8e1H1yRer27iiOfT7XVnwk8Dueg==",
       "dependencies": {
-        "@react-native-community/cli-debugger-ui": "11.3.5",
-        "@react-native-community/cli-tools": "11.3.5",
+        "@react-native-community/cli-debugger-ui": "11.3.6",
+        "@react-native-community/cli-tools": "11.3.6",
         "compression": "^1.7.1",
         "connect": "^3.6.5",
         "errorhandler": "^1.5.1",
@@ -7530,9 +8079,9 @@
       }
     },
     "node_modules/@react-native-community/cli-tools": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-tools/-/cli-tools-11.3.5.tgz",
-      "integrity": "sha512-zDklE1+ah/zL4BLxut5XbzqCj9KTHzbYBKX7//cXw2/0TpkNCaY9c+iKx//gZ5m7U1OKbb86Fm2b0AKtKVRf6Q==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-tools/-/cli-tools-11.3.6.tgz",
+      "integrity": "sha512-JpmUTcDwAGiTzLsfMlIAYpCMSJ9w2Qlf7PU7mZIRyEu61UzEawyw83DkqfbzDPBuRwRnaeN44JX2CP/yTO3ThQ==",
       "dependencies": {
         "appdirsjs": "^1.2.4",
         "chalk": "^4.1.2",
@@ -7541,7 +8090,7 @@
         "node-fetch": "^2.6.0",
         "open": "^6.2.0",
         "ora": "^5.4.1",
-        "semver": "^6.3.0",
+        "semver": "^7.5.2",
         "shell-quote": "^1.7.3"
       }
     },
@@ -7617,14 +8166,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/@react-native-community/cli-tools/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/@react-native-community/cli-tools/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -7637,9 +8178,9 @@
       }
     },
     "node_modules/@react-native-community/cli-types": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-types/-/cli-types-11.3.5.tgz",
-      "integrity": "sha512-pf0kdWMEfPSV/+8rcViDCFzbLMtWIHMZ8ay7hKwqaoWegsJ0oprSF2tSTH+LSC/7X1Beb9ssIvHj1m5C4es5Xg==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-types/-/cli-types-11.3.6.tgz",
+      "integrity": "sha512-6DxjrMKx5x68N/tCJYVYRKAtlRHbtUVBZrnAvkxbRWFD9v4vhNgsPM0RQm8i2vRugeksnao5mbnRGpS6c0awCw==",
       "dependencies": {
         "joi": "^17.2.1"
       }
@@ -7782,14 +8323,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/@react-native-community/cli/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/@react-native-community/cli/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -8036,15 +8569,15 @@
       "license": "MIT"
     },
     "node_modules/@react-native/metro-config": {
-      "version": "0.72.9",
-      "resolved": "https://registry.npmjs.org/@react-native/metro-config/-/metro-config-0.72.9.tgz",
-      "integrity": "sha512-5MGmyDnXPeprRuvgPGE4LZ+e+ovofSd5YY6nFDwg6wbjRGOkeCRRlaTlQT+fjmv+zr4vYG+MUTKBlaO+fui/vA==",
+      "version": "0.72.11",
+      "resolved": "https://registry.npmjs.org/@react-native/metro-config/-/metro-config-0.72.11.tgz",
+      "integrity": "sha512-661EyQnDdVelyc0qP/ew7kKkGAh6N6KlkuPLC2SQ8sxaXskVU6fSuNlpLW4bUTBUDFKG8gEOU2hp6rzk4wQnGQ==",
       "dev": true,
       "dependencies": {
         "@react-native/js-polyfills": "^0.72.1",
-        "metro-config": "0.76.7",
-        "metro-react-native-babel-transformer": "0.76.7",
-        "metro-runtime": "0.76.7"
+        "metro-config": "0.76.8",
+        "metro-react-native-babel-transformer": "0.76.8",
+        "metro-runtime": "0.76.8"
       }
     },
     "node_modules/@react-native/normalize-color": {
@@ -8057,9 +8590,9 @@
       "integrity": "sha512-285lfdqSXaqKuBbbtP9qL2tDrfxdOFtIMvkKadtleRQkdOxx+uzGvFr82KHmc/sSiMtfXGp7JnFYWVh4sFl7Yw=="
     },
     "node_modules/@react-native/virtualized-lists": {
-      "version": "0.72.6",
-      "resolved": "https://registry.npmjs.org/@react-native/virtualized-lists/-/virtualized-lists-0.72.6.tgz",
-      "integrity": "sha512-JhT6ydu35LvbSKdwnhWDuGHMOwM0WAh9oza/X8vXHA8ELHRyQ/4p8eKz/bTQcbQziJaaleUURToGhFuCtgiMoA==",
+      "version": "0.72.8",
+      "resolved": "https://registry.npmjs.org/@react-native/virtualized-lists/-/virtualized-lists-0.72.8.tgz",
+      "integrity": "sha512-J3Q4Bkuo99k7mu+jPS9gSUSgq+lLRSI/+ahXNwV92XgJ/8UgOTxu2LPwhJnBk/sQKxq7E8WkZBnBiozukQMqrw==",
       "dependencies": {
         "invariant": "^2.2.4",
         "nullthrows": "^1.1.1"
@@ -19477,7 +20010,9 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/abort-controller": {
       "version": "3.0.0",
@@ -19561,6 +20096,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,
@@ -19572,20 +20116,6 @@
         "node": ">= 6.0.0"
       }
     },
-    "node_modules/agentkeepalive": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.3.0.tgz",
-      "integrity": "sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.0",
-        "depd": "^2.0.0",
-        "humanize-ms": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 8.0.0"
-      }
-    },
     "node_modules/aggregate-error": {
       "version": "3.1.0",
       "dev": true,
@@ -19874,16 +20404,15 @@
       "dev": true
     },
     "node_modules/app-builder-lib": {
-      "version": "24.5.0",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.5.0.tgz",
-      "integrity": "sha512-f8R0aWIl5/JVipwP9QvEDIuebo191zGTco/aEdJQpMinQaIZSIS3U8kt1vZxYe7kGXZ3S0zNf6h7SMcWKRLzcQ==",
+      "version": "24.6.4",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.6.4.tgz",
+      "integrity": "sha512-m9931WXb83teb32N0rKg+ulbn6+Hl8NV5SUpVDOVz9MWOXfhV6AQtTdftf51zJJvCQnQugGtSqoLvgw6mdF/Rg==",
       "dev": true,
       "dependencies": {
         "@develar/schema-utils": "~2.6.5",
-        "@electron/notarize": "^1.2.3",
-        "@electron/osx-sign": "^1.0.4",
-        "@electron/rebuild": "^3.2.13",
-        "@electron/universal": "1.3.4",
+        "@electron/notarize": "2.1.0",
+        "@electron/osx-sign": "1.0.5",
+        "@electron/universal": "1.4.1",
         "@malept/flatpak-bundler": "^0.4.0",
         "@types/fs-extra": "9.0.13",
         "7zip-bin": "~5.1.1",
@@ -19913,6 +20442,35 @@
         "node": ">=14.0.0"
       }
     },
+    "node_modules/app-builder-lib/node_modules/@electron/notarize": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.1.0.tgz",
+      "integrity": "sha512-Q02xem1D0sg4v437xHgmBLxI2iz/fc0D4K7fiVWHa/AnW8o7D751xyKNXgziA6HrTOme9ul1JfWN5ark8WH1xA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "fs-extra": "^9.0.1",
+        "promise-retry": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/app-builder-lib/node_modules/@electron/notarize/node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "dev": true,
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/app-builder-lib/node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -21059,7 +21617,8 @@
     },
     "node_modules/babel-plugin-syntax-trailing-function-commas": {
       "version": "7.0.0-beta.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz",
+      "integrity": "sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ=="
     },
     "node_modules/babel-plugin-transform-class-properties": {
       "version": "6.24.1",
@@ -21125,7 +21684,8 @@
     },
     "node_modules/babel-preset-fbjs": {
       "version": "3.4.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/babel-preset-fbjs/-/babel-preset-fbjs-3.4.0.tgz",
+      "integrity": "sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow==",
       "dependencies": {
         "@babel/plugin-proposal-class-properties": "^7.0.0",
         "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
@@ -21384,6 +21944,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,9 +23250,9 @@
       }
     },
     "node_modules/cli-spinners": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.0.tgz",
-      "integrity": "sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==",
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.1.tgz",
+      "integrity": "sha512-jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ==",
       "engines": {
         "node": ">=6"
       },
@@ -22817,6 +23417,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",
@@ -23110,7 +23719,8 @@
     },
     "node_modules/connect": {
       "version": "3.7.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
+      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
       "dependencies": {
         "debug": "2.6.9",
         "finalhandler": "1.1.2",
@@ -23131,14 +23741,16 @@
     },
     "node_modules/connect/node_modules/debug": {
       "version": "2.6.9",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/connect/node_modules/finalhandler": {
       "version": "1.1.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
@@ -23154,11 +23766,13 @@
     },
     "node_modules/connect/node_modules/ms": {
       "version": "2.0.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/connect/node_modules/on-finished": {
       "version": "2.3.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
       "dependencies": {
         "ee-first": "1.1.1"
       },
@@ -23168,7 +23782,8 @@
     },
     "node_modules/connect/node_modules/statuses": {
       "version": "1.5.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -23471,6 +24086,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,
@@ -24535,7 +25159,8 @@
     },
     "node_modules/denodeify": {
       "version": "1.2.1",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/denodeify/-/denodeify-1.2.1.tgz",
+      "integrity": "sha512-KNTihKNmQENUZeKu5fzfpzRqR5S2VMp4gl9RFHiWzj9DfvYQPMJ6XHKNaQxaGCXwPk6y9yme3aUoaiAe+KX+vg=="
     },
     "node_modules/depd": {
       "version": "2.0.0",
@@ -24600,6 +25225,8 @@
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
       "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -24712,12 +25339,12 @@
       }
     },
     "node_modules/dmg-builder": {
-      "version": "24.5.0",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.5.0.tgz",
-      "integrity": "sha512-xQHaXMALL85hQJVR2CKMmN8xibjwo2Ukjpj7aape/mAfE+w7E5RNg0nD/RVQ5uj5AHPySVFHiCGrAkjXjUPOcw==",
+      "version": "24.6.4",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.6.4.tgz",
+      "integrity": "sha512-BNcHRc9CWEuI9qt0E655bUBU/j/3wUCYBVKGu1kVpbN5lcUdEJJJeiO0NHK3dgKmra6LUUZlo+mWqc+OCbi0zw==",
       "dev": true,
       "dependencies": {
-        "app-builder-lib": "24.5.0",
+        "app-builder-lib": "24.6.4",
         "builder-util": "24.5.0",
         "builder-util-runtime": "9.2.1",
         "fs-extra": "^10.1.0",
@@ -25005,9 +25632,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": {
@@ -25023,21 +25650,21 @@
       }
     },
     "node_modules/electron-builder": {
-      "version": "24.5.0",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.5.0.tgz",
-      "integrity": "sha512-IyF6aYq5zcTz15ZkUK/PuFs3nW/fSR68ZgC/3ac32exw4ivQI0FlZLIEkJLpfI43pUFTtnvwv9Wsm1iDSf9aPw==",
+      "version": "24.6.4",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.6.4.tgz",
+      "integrity": "sha512-uNWQoU7pE7qOaIQ6CJHpBi44RJFVG8OHRBIadUxrsDJVwLLo8Nma3K/EEtx5/UyWAQYdcK4nVPYKoRqBb20hbA==",
       "dev": true,
       "dependencies": {
-        "app-builder-lib": "24.5.0",
+        "app-builder-lib": "24.6.4",
         "builder-util": "24.5.0",
         "builder-util-runtime": "9.2.1",
         "chalk": "^4.1.2",
-        "dmg-builder": "24.5.0",
+        "dmg-builder": "24.6.4",
         "fs-extra": "^10.1.0",
         "is-ci": "^3.0.0",
         "lazy-val": "^1.0.5",
         "read-config-file": "6.3.2",
-        "simple-update-notifier": "^1.1.0",
+        "simple-update-notifier": "2.0.0",
         "yargs": "^17.6.2"
       },
       "bin": {
@@ -25342,6 +25969,7 @@
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
       "optional": true,
+      "peer": true,
       "dependencies": {
         "iconv-lite": "^0.6.2"
       }
@@ -25865,9 +26493,9 @@
       }
     },
     "node_modules/eslint-config-expensify": {
-      "version": "2.0.38",
-      "resolved": "https://registry.npmjs.org/eslint-config-expensify/-/eslint-config-expensify-2.0.38.tgz",
-      "integrity": "sha512-jAlrYSjkDV8YESUUPcaTjUM8Fgru+37FS+Hq6zzcRR0FbA5bLiOPguhJHo77XpYh5N+PEf4wrpgsS04sjdgDPg==",
+      "version": "2.0.39",
+      "resolved": "https://registry.npmjs.org/eslint-config-expensify/-/eslint-config-expensify-2.0.39.tgz",
+      "integrity": "sha512-DIxR3k99ZIDPE2NK+WLLRWpoDq06gTXdY8XZg9Etd1UqZ7fXm/Yz3/QkTxu7CH7UaXbCH3P4PTo023ULQGKOSw==",
       "dev": true,
       "dependencies": {
         "@lwc/eslint-plugin-lwc": "^0.11.0",
@@ -27479,8 +28107,8 @@
     },
     "node_modules/expensify-common": {
       "version": "1.0.0",
-      "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#e63d06e239fe5b2f221e86eab71ae8a4e3b8bee3",
-      "integrity": "sha512-ufptwN4Ef0JiBwvit3qN9zY8y6gFQHlMJWe+Poc0cQ0XcAuYIFSxbE0cAojMuRw7eA1to87JKKF028APIXRM/Q==",
+      "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#1609f1848cc0c2528064519c3ea48b4953a708ee",
+      "integrity": "sha512-sUd/ky6xCB/mShVaD2nVkedGL2xy+h6Jf5MfX9GOiYX8wB2D8uZSpqswz515uwcp8RDWrA5wxM2cR6pBXNfgxw==",
       "license": "MIT",
       "dependencies": {
         "classnames": "2.3.1",
@@ -27562,12 +28190,6 @@
       "version": "1.13.1",
       "license": "MIT"
     },
-    "node_modules/exponential-backoff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
-      "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==",
-      "dev": true
-    },
     "node_modules/express": {
       "version": "4.18.1",
       "dev": true,
@@ -28262,7 +28884,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.1",
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
       "dev": true,
       "funding": [
         {
@@ -28270,7 +28894,6 @@
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
-      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       },
@@ -28469,6 +29092,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,
@@ -29756,15 +30388,6 @@
         "node": ">=10.17.0"
       }
     },
-    "node_modules/humanize-ms": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
-      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.0.0"
-      }
-    },
     "node_modules/husky": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/husky/-/husky-1.3.1.tgz",
@@ -30802,12 +31425,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/is-lambda": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
-      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
-      "dev": true
-    },
     "node_modules/is-map": {
       "version": "2.0.2",
       "dev": true,
@@ -33543,9 +34160,9 @@
       }
     },
     "node_modules/joi": {
-      "version": "17.9.2",
-      "resolved": "https://registry.npmjs.org/joi/-/joi-17.9.2.tgz",
-      "integrity": "sha512-Itk/r+V4Dx0V3c7RLFdRh12IOjySm2/WGPMubBT92cQvRfYZhPM2W0hZlctjj72iES8jsRCwp7S/cRmWBnJ4nw==",
+      "version": "17.10.1",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-17.10.1.tgz",
+      "integrity": "sha512-vIiDxQKmRidUVp8KngT8MZSOcmRVm2zV7jbMjNYWuHcJWI0bUck3nRTGQjhpPlQenIQIBC5Vp9AhcnHbWQqafw==",
       "dependencies": {
         "@hapi/hoek": "^9.0.0",
         "@hapi/topo": "^5.0.0",
@@ -34205,7 +34822,8 @@
     },
     "node_modules/lodash.throttle": {
       "version": "4.1.1",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
+      "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
     },
     "node_modules/lodash.truncate": {
       "version": "4.4.2",
@@ -34607,234 +35225,6 @@
         "url": "https://github.com/wojtekmaj/make-event-props?sponsor=1"
       }
     },
-    "node_modules/make-fetch-happen": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz",
-      "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==",
-      "dev": true,
-      "dependencies": {
-        "agentkeepalive": "^4.2.1",
-        "cacache": "^17.0.0",
-        "http-cache-semantics": "^4.1.1",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "is-lambda": "^1.0.1",
-        "lru-cache": "^7.7.1",
-        "minipass": "^5.0.0",
-        "minipass-fetch": "^3.0.0",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "negotiator": "^0.6.3",
-        "promise-retry": "^2.0.1",
-        "socks-proxy-agent": "^7.0.0",
-        "ssri": "^10.0.0"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/@npmcli/fs": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz",
-      "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/cacache": {
-      "version": "17.1.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz",
-      "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==",
-      "dev": true,
-      "dependencies": {
-        "@npmcli/fs": "^3.1.0",
-        "fs-minipass": "^3.0.0",
-        "glob": "^10.2.2",
-        "lru-cache": "^7.7.1",
-        "minipass": "^7.0.3",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "p-map": "^4.0.0",
-        "ssri": "^10.0.0",
-        "tar": "^6.1.11",
-        "unique-filename": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/cacache/node_modules/minipass": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz",
-      "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==",
-      "dev": true,
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/foreground-child": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.0",
-        "signal-exit": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/fs-minipass": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
-      "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^7.0.3"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/fs-minipass/node_modules/minipass": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz",
-      "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==",
-      "dev": true,
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/glob": {
-      "version": "10.3.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz",
-      "integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==",
-      "dev": true,
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^2.0.3",
-        "minimatch": "^9.0.1",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-        "path-scurry": "^1.10.1"
-      },
-      "bin": {
-        "glob": "dist/cjs/src/bin.js"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/lru-cache": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/ssri": {
-      "version": "10.0.5",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz",
-      "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^7.0.3"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/ssri/node_modules/minipass": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz",
-      "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==",
-      "dev": true,
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/unique-filename": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
-      "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
-      "dev": true,
-      "dependencies": {
-        "unique-slug": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/make-fetch-happen/node_modules/unique-slug": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
-      "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/makeerror": {
       "version": "1.0.12",
       "license": "BSD-3-Clause",
@@ -35820,9 +36210,10 @@
       }
     },
     "node_modules/metro": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro/-/metro-0.76.7.tgz",
-      "integrity": "sha512-67ZGwDeumEPnrHI+pEDSKH2cx+C81Gx8Mn5qOtmGUPm/Up9Y4I1H2dJZ5n17MWzejNo0XAvPh0QL0CrlJEODVQ==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro/-/metro-0.76.8.tgz",
+      "integrity": "sha512-oQA3gLzrrYv3qKtuWArMgHPbHu8odZOD9AoavrqSFllkPgOtmkBvNNDLCELqv5SjBfqjISNffypg+5UGG3y0pg==",
+      "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "@babel/core": "^7.20.0",
@@ -35846,22 +36237,22 @@
         "jest-worker": "^27.2.0",
         "jsc-safe-url": "^0.2.2",
         "lodash.throttle": "^4.1.1",
-        "metro-babel-transformer": "0.76.7",
-        "metro-cache": "0.76.7",
-        "metro-cache-key": "0.76.7",
-        "metro-config": "0.76.7",
-        "metro-core": "0.76.7",
-        "metro-file-map": "0.76.7",
-        "metro-inspector-proxy": "0.76.7",
-        "metro-minify-terser": "0.76.7",
-        "metro-minify-uglify": "0.76.7",
-        "metro-react-native-babel-preset": "0.76.7",
-        "metro-resolver": "0.76.7",
-        "metro-runtime": "0.76.7",
-        "metro-source-map": "0.76.7",
-        "metro-symbolicate": "0.76.7",
-        "metro-transform-plugins": "0.76.7",
-        "metro-transform-worker": "0.76.7",
+        "metro-babel-transformer": "0.76.8",
+        "metro-cache": "0.76.8",
+        "metro-cache-key": "0.76.8",
+        "metro-config": "0.76.8",
+        "metro-core": "0.76.8",
+        "metro-file-map": "0.76.8",
+        "metro-inspector-proxy": "0.76.8",
+        "metro-minify-terser": "0.76.8",
+        "metro-minify-uglify": "0.76.8",
+        "metro-react-native-babel-preset": "0.76.8",
+        "metro-resolver": "0.76.8",
+        "metro-runtime": "0.76.8",
+        "metro-source-map": "0.76.8",
+        "metro-symbolicate": "0.76.8",
+        "metro-transform-plugins": "0.76.8",
+        "metro-transform-worker": "0.76.8",
         "mime-types": "^2.1.27",
         "node-fetch": "^2.2.0",
         "nullthrows": "^1.1.1",
@@ -35881,9 +36272,10 @@
       }
     },
     "node_modules/metro-babel-transformer": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.76.7.tgz",
-      "integrity": "sha512-bgr2OFn0J4r0qoZcHrwEvccF7g9k3wdgTOgk6gmGHrtlZ1Jn3oCpklW/DfZ9PzHfjY2mQammKTc19g/EFGyOJw==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.76.8.tgz",
+      "integrity": "sha512-Hh6PW34Ug/nShlBGxkwQJSgPGAzSJ9FwQXhUImkzdsDgVu6zj5bx258J8cJVSandjNoQ8nbaHK6CaHlnbZKbyA==",
+      "dev": true,
       "dependencies": {
         "@babel/core": "^7.20.0",
         "hermes-parser": "0.12.0",
@@ -35894,11 +36286,12 @@
       }
     },
     "node_modules/metro-cache": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-cache/-/metro-cache-0.76.7.tgz",
-      "integrity": "sha512-nWBMztrs5RuSxZRI7hgFgob5PhYDmxICh9FF8anm9/ito0u0vpPvRxt7sRu8fyeD2AHdXqE7kX32rWY0LiXgeg==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-cache/-/metro-cache-0.76.8.tgz",
+      "integrity": "sha512-QBJSJIVNH7Hc/Yo6br/U/qQDUpiUdRgZ2ZBJmvAbmAKp2XDzsapnMwK/3BGj8JNWJF7OLrqrYHsRsukSbUBpvQ==",
+      "dev": true,
       "dependencies": {
-        "metro-core": "0.76.7",
+        "metro-core": "0.76.8",
         "rimraf": "^3.0.2"
       },
       "engines": {
@@ -35906,25 +36299,27 @@
       }
     },
     "node_modules/metro-cache-key": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-cache-key/-/metro-cache-key-0.76.7.tgz",
-      "integrity": "sha512-0pecoIzwsD/Whn/Qfa+SDMX2YyasV0ndbcgUFx7w1Ct2sLHClujdhQ4ik6mvQmsaOcnGkIyN0zcceMDjC2+BFQ==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-cache-key/-/metro-cache-key-0.76.8.tgz",
+      "integrity": "sha512-buKQ5xentPig9G6T37Ww/R/bC+/V1MA5xU/D8zjnhlelsrPG6w6LtHUS61ID3zZcMZqYaELWk5UIadIdDsaaLw==",
+      "dev": true,
       "engines": {
         "node": ">=16"
       }
     },
     "node_modules/metro-config": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-config/-/metro-config-0.76.7.tgz",
-      "integrity": "sha512-CFDyNb9bqxZemiChC/gNdXZ7OQkIwmXzkrEXivcXGbgzlt/b2juCv555GWJHyZSlorwnwJfY3uzAFu4A9iRVfg==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-config/-/metro-config-0.76.8.tgz",
+      "integrity": "sha512-SL1lfKB0qGHALcAk2zBqVgQZpazDYvYFGwCK1ikz0S6Y/CM2i2/HwuZN31kpX6z3mqjv/6KvlzaKoTb1otuSAA==",
+      "dev": true,
       "dependencies": {
         "connect": "^3.6.5",
         "cosmiconfig": "^5.0.5",
         "jest-validate": "^29.2.1",
-        "metro": "0.76.7",
-        "metro-cache": "0.76.7",
-        "metro-core": "0.76.7",
-        "metro-runtime": "0.76.7"
+        "metro": "0.76.8",
+        "metro-cache": "0.76.8",
+        "metro-core": "0.76.8",
+        "metro-runtime": "0.76.8"
       },
       "engines": {
         "node": ">=16"
@@ -35934,6 +36329,7 @@
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
       "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+      "dev": true,
       "dependencies": {
         "import-fresh": "^2.0.0",
         "is-directory": "^0.3.1",
@@ -35948,6 +36344,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
       "integrity": "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==",
+      "dev": true,
       "dependencies": {
         "caller-path": "^2.0.0",
         "resolve-from": "^3.0.0"
@@ -35960,6 +36357,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
       "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+      "dev": true,
       "dependencies": {
         "error-ex": "^1.3.1",
         "json-parse-better-errors": "^1.0.1"
@@ -35972,26 +36370,29 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
       "integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/metro-core": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.76.7.tgz",
-      "integrity": "sha512-0b8KfrwPmwCMW+1V7ZQPkTy2tsEKZjYG9Pu1PTsu463Z9fxX7WaR0fcHFshv+J1CnQSUTwIGGjbNvj1teKe+pw==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.76.8.tgz",
+      "integrity": "sha512-sl2QLFI3d1b1XUUGxwzw/KbaXXU/bvFYrSKz6Sg19AdYGWFyzsgZ1VISRIDf+HWm4R/TJXluhWMEkEtZuqi3qA==",
+      "dev": true,
       "dependencies": {
         "lodash.throttle": "^4.1.1",
-        "metro-resolver": "0.76.7"
+        "metro-resolver": "0.76.8"
       },
       "engines": {
         "node": ">=16"
       }
     },
     "node_modules/metro-file-map": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-file-map/-/metro-file-map-0.76.7.tgz",
-      "integrity": "sha512-s+zEkTcJ4mOJTgEE2ht4jIo1DZfeWreQR3tpT3gDV/Y/0UQ8aJBTv62dE775z0GLsWZApiblAYZsj7ZE8P06nw==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-file-map/-/metro-file-map-0.76.8.tgz",
+      "integrity": "sha512-A/xP1YNEVwO1SUV9/YYo6/Y1MmzhL4ZnVgcJC3VmHp/BYVOXVStzgVbWv2wILe56IIMkfXU+jpXrGKKYhFyHVw==",
+      "dev": true,
       "dependencies": {
         "anymatch": "^3.0.3",
         "debug": "^2.2.0",
@@ -36017,6 +36418,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
       "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+      "dev": true,
       "dependencies": {
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
@@ -36032,6 +36434,7 @@
       "version": "16.0.5",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.5.tgz",
       "integrity": "sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==",
+      "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
@@ -36040,6 +36443,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -36054,6 +36458,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -36069,6 +36474,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -36079,12 +36485,14 @@
     "node_modules/metro-file-map/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/metro-file-map/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -36093,6 +36501,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -36101,6 +36510,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
       "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
+      "dev": true,
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
       }
@@ -36109,6 +36519,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
       "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+      "dev": true,
       "dependencies": {
         "@jest/types": "^27.5.1",
         "@types/node": "*",
@@ -36125,6 +36536,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
       "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -36138,6 +36550,7 @@
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -36151,12 +36564,14 @@
     "node_modules/metro-file-map/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
     },
     "node_modules/metro-file-map/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -36165,9 +36580,10 @@
       }
     },
     "node_modules/metro-inspector-proxy": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-inspector-proxy/-/metro-inspector-proxy-0.76.7.tgz",
-      "integrity": "sha512-rNZ/6edTl/1qUekAhAbaFjczMphM50/UjtxiKulo6vqvgn/Mjd9hVqDvVYfAMZXqPvlusD88n38UjVYPkruLSg==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-inspector-proxy/-/metro-inspector-proxy-0.76.8.tgz",
+      "integrity": "sha512-Us5o5UEd4Smgn1+TfHX4LvVPoWVo9VsVMn4Ldbk0g5CQx3Gu0ygc/ei2AKPGTwsOZmKxJeACj7yMH2kgxQP/iw==",
+      "dev": true,
       "dependencies": {
         "connect": "^3.6.5",
         "debug": "^2.2.0",
@@ -36186,6 +36602,7 @@
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
       "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.1",
@@ -36199,6 +36616,7 @@
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -36206,12 +36624,14 @@
     "node_modules/metro-inspector-proxy/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
     },
     "node_modules/metro-inspector-proxy/node_modules/ws": {
       "version": "7.5.9",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
       "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "dev": true,
       "engines": {
         "node": ">=8.3.0"
       },
@@ -36232,6 +36652,7 @@
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -36240,6 +36661,7 @@
       "version": "17.7.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
       "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
       "dependencies": {
         "cliui": "^8.0.1",
         "escalade": "^3.1.1",
@@ -36257,14 +36679,16 @@
       "version": "21.1.1",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
       "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/metro-minify-terser": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-minify-terser/-/metro-minify-terser-0.76.7.tgz",
-      "integrity": "sha512-FQiZGhIxCzhDwK4LxyPMLlq0Tsmla10X7BfNGlYFK0A5IsaVKNJbETyTzhpIwc+YFRT4GkFFwgo0V2N5vxO5HA==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-minify-terser/-/metro-minify-terser-0.76.8.tgz",
+      "integrity": "sha512-Orbvg18qXHCrSj1KbaeSDVYRy/gkro2PC7Fy2tDSH1c9RB4aH8tuMOIXnKJE+1SXxBtjWmQ5Yirwkth2DyyEZA==",
+      "dev": true,
       "dependencies": {
         "terser": "^5.15.0"
       },
@@ -36273,9 +36697,10 @@
       }
     },
     "node_modules/metro-minify-uglify": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-minify-uglify/-/metro-minify-uglify-0.76.7.tgz",
-      "integrity": "sha512-FuXIU3j2uNcSvQtPrAJjYWHruPiQ+EpE++J9Z+VznQKEHcIxMMoQZAfIF2IpZSrZYfLOjVFyGMvj41jQMxV1Vw==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-minify-uglify/-/metro-minify-uglify-0.76.8.tgz",
+      "integrity": "sha512-6l8/bEvtVaTSuhG1FqS0+Mc8lZ3Bl4RI8SeRIifVLC21eeSDp4CEBUWSGjpFyUDfi6R5dXzYaFnSgMNyfxADiQ==",
+      "dev": true,
       "dependencies": {
         "uglify-es": "^3.1.9"
       },
@@ -36284,9 +36709,10 @@
       }
     },
     "node_modules/metro-react-native-babel-preset": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.76.7.tgz",
-      "integrity": "sha512-R25wq+VOSorAK3hc07NW0SmN8z9S/IR0Us0oGAsBcMZnsgkbOxu77Mduqf+f4is/wnWHc5+9bfiqdLnaMngiVw==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.76.8.tgz",
+      "integrity": "sha512-Ptza08GgqzxEdK8apYsjTx2S8WDUlS2ilBlu9DR1CUcHmg4g3kOkFylZroogVAUKtpYQNYwAvdsjmrSdDNtiAg==",
+      "dev": true,
       "dependencies": {
         "@babel/core": "^7.20.0",
         "@babel/plugin-proposal-async-generator-functions": "^7.0.0",
@@ -36337,20 +36763,22 @@
     },
     "node_modules/metro-react-native-babel-preset/node_modules/react-refresh": {
       "version": "0.4.3",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/metro-react-native-babel-transformer": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.76.7.tgz",
-      "integrity": "sha512-W6lW3J7y/05ph3c2p3KKJNhH0IdyxdOCbQ5it7aM2MAl0SM4wgKjaV6EYv9b3rHklpV6K3qMH37UKVcjMooWiA==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.76.8.tgz",
+      "integrity": "sha512-3h+LfS1WG1PAzhq8QF0kfXjxuXetbY/lgz8vYMQhgrMMp17WM1DNJD0gjx8tOGYbpbBC1qesJ45KMS4o5TA73A==",
+      "dev": true,
       "dependencies": {
         "@babel/core": "^7.20.0",
         "babel-preset-fbjs": "^3.4.0",
         "hermes-parser": "0.12.0",
-        "metro-react-native-babel-preset": "0.76.7",
+        "metro-react-native-babel-preset": "0.76.8",
         "nullthrows": "^1.1.1"
       },
       "engines": {
@@ -36361,17 +36789,18 @@
       }
     },
     "node_modules/metro-resolver": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-resolver/-/metro-resolver-0.76.7.tgz",
-      "integrity": "sha512-pC0Wgq29HHIHrwz23xxiNgylhI8Rq1V01kQaJ9Kz11zWrIdlrH0ZdnJ7GC6qA0ErROG+cXmJ0rJb8/SW1Zp2IA==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-resolver/-/metro-resolver-0.76.8.tgz",
+      "integrity": "sha512-KccOqc10vrzS7ZhG2NSnL2dh3uVydarB7nOhjreQ7C4zyWuiW9XpLC4h47KtGQv3Rnv/NDLJYeDqaJ4/+140HQ==",
+      "dev": true,
       "engines": {
         "node": ">=16"
       }
     },
     "node_modules/metro-runtime": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-runtime/-/metro-runtime-0.76.7.tgz",
-      "integrity": "sha512-MuWHubQHymUWBpZLwuKZQgA/qbb35WnDAKPo83rk7JRLIFPvzXSvFaC18voPuzJBt1V98lKQIonh6MiC9gd8Ug==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-runtime/-/metro-runtime-0.76.8.tgz",
+      "integrity": "sha512-XKahvB+iuYJSCr3QqCpROli4B4zASAYpkK+j3a0CJmokxCDNbgyI4Fp88uIL6rNaZfN0Mv35S0b99SdFXIfHjg==",
       "dependencies": {
         "@babel/runtime": "^7.0.0",
         "react-refresh": "^0.4.0"
@@ -36389,16 +36818,16 @@
       }
     },
     "node_modules/metro-source-map": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.76.7.tgz",
-      "integrity": "sha512-Prhx7PeRV1LuogT0Kn5VjCuFu9fVD68eefntdWabrksmNY6mXK8pRqzvNJOhTojh6nek+RxBzZeD6MIOOyXS6w==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.76.8.tgz",
+      "integrity": "sha512-Hh0ncPsHPVf6wXQSqJqB3K9Zbudht4aUtNpNXYXSxH+pteWqGAXnjtPsRAnCsCWl38wL0jYF0rJDdMajUI3BDw==",
       "dependencies": {
         "@babel/traverse": "^7.20.0",
         "@babel/types": "^7.20.0",
         "invariant": "^2.2.4",
-        "metro-symbolicate": "0.76.7",
+        "metro-symbolicate": "0.76.8",
         "nullthrows": "^1.1.1",
-        "ob1": "0.76.7",
+        "ob1": "0.76.8",
         "source-map": "^0.5.6",
         "vlq": "^1.0.0"
       },
@@ -36415,12 +36844,12 @@
       }
     },
     "node_modules/metro-symbolicate": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.76.7.tgz",
-      "integrity": "sha512-p0zWEME5qLSL1bJb93iq+zt5fz3sfVn9xFYzca1TJIpY5MommEaS64Va87lp56O0sfEIvh4307Oaf/ZzRjuLiQ==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.76.8.tgz",
+      "integrity": "sha512-LrRL3uy2VkzrIXVlxoPtqb40J6Bf1mlPNmUQewipc3qfKKFgtPHBackqDy1YL0njDsWopCKcfGtFYLn0PTUn3w==",
       "dependencies": {
         "invariant": "^2.2.4",
-        "metro-source-map": "0.76.7",
+        "metro-source-map": "0.76.8",
         "nullthrows": "^1.1.1",
         "source-map": "^0.5.6",
         "through2": "^2.0.1",
@@ -36442,9 +36871,10 @@
       }
     },
     "node_modules/metro-transform-plugins": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-transform-plugins/-/metro-transform-plugins-0.76.7.tgz",
-      "integrity": "sha512-iSmnjVApbdivjuzb88Orb0JHvcEt5veVyFAzxiS5h0QB+zV79w6JCSqZlHCrbNOkOKBED//LqtKbFVakxllnNg==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-transform-plugins/-/metro-transform-plugins-0.76.8.tgz",
+      "integrity": "sha512-PlkGTQNqS51Bx4vuufSQCdSn2R2rt7korzngo+b5GCkeX5pjinPjnO2kNhQ8l+5bO0iUD/WZ9nsM2PGGKIkWFA==",
+      "dev": true,
       "dependencies": {
         "@babel/core": "^7.20.0",
         "@babel/generator": "^7.20.0",
@@ -36457,21 +36887,22 @@
       }
     },
     "node_modules/metro-transform-worker": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-transform-worker/-/metro-transform-worker-0.76.7.tgz",
-      "integrity": "sha512-cGvELqFMVk9XTC15CMVzrCzcO6sO1lURfcbgjuuPdzaWuD11eEyocvkTX0DPiRjsvgAmicz4XYxVzgYl3MykDw==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-transform-worker/-/metro-transform-worker-0.76.8.tgz",
+      "integrity": "sha512-mE1fxVAnJKmwwJyDtThildxxos9+DGs9+vTrx2ktSFMEVTtXS/bIv2W6hux1pqivqAfyJpTeACXHk5u2DgGvIQ==",
+      "dev": true,
       "dependencies": {
         "@babel/core": "^7.20.0",
         "@babel/generator": "^7.20.0",
         "@babel/parser": "^7.20.0",
         "@babel/types": "^7.20.0",
         "babel-preset-fbjs": "^3.4.0",
-        "metro": "0.76.7",
-        "metro-babel-transformer": "0.76.7",
-        "metro-cache": "0.76.7",
-        "metro-cache-key": "0.76.7",
-        "metro-source-map": "0.76.7",
-        "metro-transform-plugins": "0.76.7",
+        "metro": "0.76.8",
+        "metro-babel-transformer": "0.76.8",
+        "metro-cache": "0.76.8",
+        "metro-cache-key": "0.76.8",
+        "metro-source-map": "0.76.8",
+        "metro-transform-plugins": "0.76.8",
         "nullthrows": "^1.1.1"
       },
       "engines": {
@@ -36482,6 +36913,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -36496,6 +36928,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -36510,12 +36943,14 @@
     "node_modules/metro/node_modules/ci-info": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "dev": true
     },
     "node_modules/metro/node_modules/cliui": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
       "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.1",
@@ -36529,6 +36964,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -36539,12 +36975,14 @@
     "node_modules/metro/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/metro/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -36553,6 +36991,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -36561,6 +37000,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
       "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -36574,6 +37014,7 @@
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -36587,12 +37028,14 @@
     "node_modules/metro/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
     },
     "node_modules/metro/node_modules/serialize-error": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz",
       "integrity": "sha512-ghgmKt5o4Tly5yEG/UJp8qTd0AN7Xalw4XBtDEKP655B699qMEtra1WlXeE6WIvdEG481JvRxULKsInq/iNysw==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -36601,6 +37044,7 @@
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
       "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -36609,6 +37053,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -36620,6 +37065,7 @@
       "version": "7.5.9",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
       "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "dev": true,
       "engines": {
         "node": ">=8.3.0"
       },
@@ -36640,6 +37086,7 @@
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -36648,6 +37095,7 @@
       "version": "17.7.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
       "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
       "dependencies": {
         "cliui": "^8.0.1",
         "escalade": "^3.1.1",
@@ -36665,6 +37113,7 @@
       "version": "21.1.1",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
       "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
       "engines": {
         "node": ">=12"
       }
@@ -37640,32 +38089,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/minipass-fetch": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.3.tgz",
-      "integrity": "sha512-n5ITsTkDqYkYJZjcRWzZt9qnZKCT7nKCosJhHoj7S7zD+BP4jVbWs+odsniw5TA3E0sLomhTKOKjF86wf11PuQ==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^5.0.0",
-        "minipass-sized": "^1.0.3",
-        "minizlib": "^2.1.2"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      },
-      "optionalDependencies": {
-        "encoding": "^0.1.13"
-      }
-    },
-    "node_modules/minipass-fetch/node_modules/minipass": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/minipass-flush": {
       "version": "1.0.5",
       "dev": true,
@@ -37688,18 +38111,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/minipass-sized": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
-      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/minizlib": {
       "version": "2.1.2",
       "dev": true,
@@ -37985,16 +38396,19 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/node-abi": {
-      "version": "3.45.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.45.0.tgz",
-      "integrity": "sha512-iwXuFrMAcFVi/ZoZiqq8BzAdsLw9kxDfTC0HMyjXfSL/6CSDAGD5UmR7azrAgWV1zKYq7dUUMj4owusBWKLsiQ==",
+    "node_modules/nock": {
+      "version": "13.3.3",
+      "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.3.tgz",
+      "integrity": "sha512-z+KUlILy9SK/RjpeXDiDUEAq4T94ADPHE3qaRkf66mpEhzc/ytOMm3Bwdrbq6k1tMWkbdujiKim3G2tfQARuJw==",
       "dev": true,
       "dependencies": {
-        "semver": "^7.3.5"
+        "debug": "^4.1.0",
+        "json-stringify-safe": "^5.0.1",
+        "lodash": "^4.17.21",
+        "propagate": "^2.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 10.13"
       }
     },
     "node_modules/node-abort-controller": {
@@ -38009,15 +38423,6 @@
       "dev": true,
       "optional": true
     },
-    "node_modules/node-api-version": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.1.4.tgz",
-      "integrity": "sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^7.3.5"
-      }
-    },
     "node_modules/node-dir": {
       "version": "0.1.17",
       "license": "MIT",
@@ -38070,92 +38475,6 @@
         "node": ">= 6.13.0"
       }
     },
-    "node_modules/node-gyp": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.0.tgz",
-      "integrity": "sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==",
-      "dev": true,
-      "dependencies": {
-        "env-paths": "^2.2.0",
-        "exponential-backoff": "^3.1.1",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.2.6",
-        "make-fetch-happen": "^11.0.3",
-        "nopt": "^6.0.0",
-        "npmlog": "^6.0.0",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.5",
-        "tar": "^6.1.2",
-        "which": "^2.0.2"
-      },
-      "bin": {
-        "node-gyp": "bin/node-gyp.js"
-      },
-      "engines": {
-        "node": "^12.13 || ^14.13 || >=16"
-      }
-    },
-    "node_modules/node-gyp/node_modules/are-we-there-yet": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
-      "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
-      "dev": true,
-      "dependencies": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^3.6.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/node-gyp/node_modules/gauge": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
-      "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
-      "dev": true,
-      "dependencies": {
-        "aproba": "^1.0.3 || ^2.0.0",
-        "color-support": "^1.1.3",
-        "console-control-strings": "^1.1.0",
-        "has-unicode": "^2.0.1",
-        "signal-exit": "^3.0.7",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "wide-align": "^1.1.5"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/node-gyp/node_modules/npmlog": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
-      "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
-      "dev": true,
-      "dependencies": {
-        "are-we-there-yet": "^3.0.0",
-        "console-control-strings": "^1.1.0",
-        "gauge": "^4.0.3",
-        "set-blocking": "^2.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
-    "node_modules/node-gyp/node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/node-int64": {
       "version": "0.4.0",
       "license": "MIT"
@@ -38223,21 +38542,6 @@
         "url": "https://github.com/sponsors/antelle"
       }
     },
-    "node_modules/nopt": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
-      "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==",
-      "dev": true,
-      "dependencies": {
-        "abbrev": "^1.0.0"
-      },
-      "bin": {
-        "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      }
-    },
     "node_modules/normalize-css-color": {
       "version": "1.0.2",
       "license": "BSD-3-Clause"
@@ -38290,6 +38594,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",
@@ -38343,9 +38656,9 @@
       "license": "MIT"
     },
     "node_modules/ob1": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/ob1/-/ob1-0.76.7.tgz",
-      "integrity": "sha512-BQdRtxxoUNfSoZxqeBGOyuT9nEYSn18xZHwGMb0mMVpn2NBcYbnyKY4BK2LIHRgw33CBGlUmE+KMaNvyTpLLtQ==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/ob1/-/ob1-0.76.8.tgz",
+      "integrity": "sha512-dlBkJJV5M/msj9KYA9upc+nUWVwuOFFTbu28X6kZeGwcuW+JxaHSBZ70SYQnk5M+j5JbNLR6yKHmgW4M5E7X5g==",
       "engines": {
         "node": ">=16"
       }
@@ -39260,14 +39573,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"
@@ -39966,6 +40271,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,
@@ -40057,10 +40371,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"
       }
     },
@@ -40072,11 +40386,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",
@@ -40527,6 +40836,17 @@
         "react": "^18.1.0"
       }
     },
+    "node_modules/react-error-boundary": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-4.0.11.tgz",
+      "integrity": "sha512-U13ul67aP5DOSPNSCWQ/eO0AQEYzEFkVljULQIjMV0KlffTAhxuDoBKdO0pb/JZ8mDhMKFZ9NZi0BmLGUiNphw==",
+      "dependencies": {
+        "@babel/runtime": "^7.12.5"
+      },
+      "peerDependencies": {
+        "react": ">=16.13.1"
+      }
+    },
     "node_modules/react-freeze": {
       "version": "1.0.3",
       "license": "MIT",
@@ -40574,20 +40894,20 @@
       }
     },
     "node_modules/react-native": {
-      "version": "0.72.3",
-      "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.72.3.tgz",
-      "integrity": "sha512-QqISi+JVmCssNP2FlQ4MWhlc4O/I00MRE1/GClvyZ8h/6kdsyk/sOirkYdZqX3+DrJfI3q+OnyMnsyaXIQ/5tQ==",
+      "version": "0.72.4",
+      "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.72.4.tgz",
+      "integrity": "sha512-+vrObi0wZR+NeqL09KihAAdVlQ9IdplwznJWtYrjnQ4UbCW6rkzZJebRsugwUneSOKNFaHFEo1uKU89HsgtYBg==",
       "dependencies": {
         "@jest/create-cache-key-function": "^29.2.1",
-        "@react-native-community/cli": "11.3.5",
-        "@react-native-community/cli-platform-android": "11.3.5",
-        "@react-native-community/cli-platform-ios": "11.3.5",
+        "@react-native-community/cli": "11.3.6",
+        "@react-native-community/cli-platform-android": "11.3.6",
+        "@react-native-community/cli-platform-ios": "11.3.6",
         "@react-native/assets-registry": "^0.72.0",
         "@react-native/codegen": "^0.72.6",
         "@react-native/gradle-plugin": "^0.72.11",
         "@react-native/js-polyfills": "^0.72.1",
         "@react-native/normalize-colors": "^0.72.0",
-        "@react-native/virtualized-lists": "^0.72.6",
+        "@react-native/virtualized-lists": "^0.72.8",
         "abort-controller": "^3.0.0",
         "anser": "^1.4.9",
         "base64-js": "^1.1.2",
@@ -40598,8 +40918,8 @@
         "jest-environment-node": "^29.2.1",
         "jsc-android": "^250231.0.0",
         "memoize-one": "^5.0.0",
-        "metro-runtime": "0.76.7",
-        "metro-source-map": "0.76.7",
+        "metro-runtime": "0.76.8",
+        "metro-source-map": "0.76.8",
         "mkdirp": "^0.5.1",
         "nullthrows": "^1.1.1",
         "pretty-format": "^26.5.2",
@@ -40779,8 +41099,8 @@
     },
     "node_modules/react-native-google-places-autocomplete": {
       "version": "2.5.1",
-      "resolved": "git+ssh://git@github.com/Expensify/react-native-google-places-autocomplete.git#ee87343c3e827ff7818abc71b6bb04fcc1f120e0",
-      "integrity": "sha512-OJWCz4Epj1p8tyNImWNykAqpd/X1MkNCFPY0dSbgiTJGbW4J5T4bC0PIUQ+ExjxWpWjcFaielTLdoSz0HfeIpw==",
+      "resolved": "git+ssh://git@github.com/Expensify/react-native-google-places-autocomplete.git#cef3ac29d9501091453136e1219e24c4ec9f9d76",
+      "integrity": "sha512-2z3ED8jOXasPTzBqvPwpG10LQsBArTRsYszmoz+TfqbgZrSBmP3c8rhaC//lx6Pvfs2r+KYWqJUrLf4mbCrjZw==",
       "license": "MIT",
       "dependencies": {
         "lodash.debounce": "^4.0.8",
@@ -40884,9 +41204,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.97",
+      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.97.tgz",
+      "integrity": "sha512-6w4pp9Ktm4lQ6jIS+ZASQ5tYwRU1lt751yxfddvmN646XZefj4iDvC7uQaUnAgg1xL52dEV5RZWaI3sQ3e9AGQ==",
       "dependencies": {
         "ascii-table": "0.0.9",
         "fast-equals": "^4.0.3",
@@ -40899,8 +41219,9 @@
       "peerDependencies": {
         "idb-keyval": "^6.2.1",
         "react": ">=18.1.0",
+        "react-dom": ">=18.1.0",
         "react-native-device-info": "^10.3.0",
-        "react-native-performance": "^4.0.0",
+        "react-native-performance": "^5.1.0",
         "react-native-quick-sqlite": "^8.0.0-beta.2"
       },
       "peerDependenciesMeta": {
@@ -40942,8 +41263,9 @@
       }
     },
     "node_modules/react-native-performance": {
-      "version": "4.0.0",
-      "license": "MIT",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/react-native-performance/-/react-native-performance-5.1.0.tgz",
+      "integrity": "sha512-rq/YBf0/GptSOM/Lj64/1yRq8uN2YE0psFB16wFbYBbTcIEp/0rrgN2HyS5lhvfBOFgKoDRWQ53jHSCb+QJ5eA==",
       "peerDependencies": {
         "react-native": "*"
       }
@@ -41013,9 +41335,9 @@
       }
     },
     "node_modules/react-native-reanimated": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.4.0.tgz",
-      "integrity": "sha512-B5cZJseoIkYlZTRBRN0xuU1NBxUza/6GSHhiEBQfbOufWVlUMMcWUecIRVglW49l8d2wXbfCdQlNyVoFqmHkaQ==",
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.4.tgz",
+      "integrity": "sha512-8we9LLDO1o4Oj9/DICeEJ2K1tjfqkJagqQUglxeUAkol/HcEJ6PGxIrpBcNryLqCDYEcu6FZWld/FzizBIw6bg==",
       "dependencies": {
         "@babel/plugin-transform-object-assign": "^7.16.7",
         "@babel/preset-typescript": "^7.16.7",
@@ -41035,7 +41357,8 @@
     },
     "node_modules/react-native-reanimated/node_modules/convert-source-map": {
       "version": "2.0.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
     },
     "node_modules/react-native-render-html": {
       "version": "6.3.1",
@@ -41100,8 +41423,9 @@
       }
     },
     "node_modules/react-native-svg": {
-      "version": "13.9.0",
-      "license": "MIT",
+      "version": "13.13.0",
+      "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-13.13.0.tgz",
+      "integrity": "sha512-L8y8uEiMG0Tr++Nb2+24wlMuv18+bmq/CMoFFtTUlEqVvGCoK2ea8WamPl/9bV8gjL+Rngg5NqEBvKS23sbYoA==",
       "dependencies": {
         "css-select": "^5.1.0",
         "css-tree": "^1.1.3"
@@ -41976,6 +42300,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",
@@ -43780,24 +44113,15 @@
       "license": "MIT"
     },
     "node_modules/simple-update-notifier": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
-      "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
+      "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",
       "dev": true,
       "dependencies": {
-        "semver": "~7.0.0"
+        "semver": "^7.5.3"
       },
       "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/simple-update-notifier/node_modules/semver": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+        "node": ">=10"
       }
     },
     "node_modules/simply-deferred": {
@@ -43888,6 +44212,7 @@
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
       "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
       "dev": true,
+      "optional": true,
       "engines": {
         "node": ">= 6.0.0",
         "npm": ">= 3.0.0"
@@ -44117,34 +44442,6 @@
         "websocket-driver": "^0.7.4"
       }
     },
-    "node_modules/socks": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
-      "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
-      "dev": true,
-      "dependencies": {
-        "ip": "^2.0.0",
-        "smart-buffer": "^4.2.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0",
-        "npm": ">= 3.0.0"
-      }
-    },
-    "node_modules/socks-proxy-agent": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz",
-      "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==",
-      "dev": true,
-      "dependencies": {
-        "agent-base": "^6.0.2",
-        "debug": "^4.3.3",
-        "socks": "^2.6.2"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
     "node_modules/sort-asc": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/sort-asc/-/sort-asc-0.2.0.tgz",
@@ -45362,7 +45659,8 @@
     },
     "node_modules/throat": {
       "version": "5.0.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
+      "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA=="
     },
     "node_modules/throttle-debounce": {
       "version": "3.0.1",
@@ -46733,7 +47031,8 @@
     },
     "node_modules/vlq": {
       "version": "1.0.1",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/vlq/-/vlq-1.0.1.tgz",
+      "integrity": "sha512-gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w=="
     },
     "node_modules/vm-browserify": {
       "version": "1.1.2",
@@ -48306,11 +48605,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": {
@@ -49479,9 +49778,11 @@
       }
     },
     "@babel/plugin-transform-object-assign": {
-      "version": "7.18.6",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.22.5.tgz",
+      "integrity": "sha512-iDhx9ARkXq4vhZ2CYOSnQXkmxkDgosLi3J8Z17mKz7LyzthtkdVchLD7WZ3aXeCuvJDOW3+1I5TpJmwIbF9MKQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-object-rest-spread": {
@@ -50303,9 +50604,9 @@
       }
     },
     "@electron/osx-sign": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.0.4.tgz",
-      "integrity": "sha512-xfhdEcIOfAZg7scZ9RQPya1G1lWo8/zMCwUXAulq0SfY7ONIW+b9qGyKdMyuMctNYwllrIS+vmxfijSfjeh97g==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.0.5.tgz",
+      "integrity": "sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==",
       "dev": true,
       "requires": {
         "compare-version": "^0.1.2",
@@ -50335,131 +50636,10 @@
         }
       }
     },
-    "@electron/rebuild": {
-      "version": "3.2.13",
-      "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.2.13.tgz",
-      "integrity": "sha512-DH9Ol4JCnHDYVOD0fKWq+Qqbn/0WU1O6QR0mIpMXEVU4YFM4PlaqNC9K36mGShNBxxGFotZCMDrB1wl/iHM12g==",
-      "dev": true,
-      "requires": {
-        "@malept/cross-spawn-promise": "^2.0.0",
-        "chalk": "^4.0.0",
-        "debug": "^4.1.1",
-        "detect-libc": "^2.0.1",
-        "fs-extra": "^10.0.0",
-        "got": "^11.7.0",
-        "node-abi": "^3.0.0",
-        "node-api-version": "^0.1.4",
-        "node-gyp": "^9.0.0",
-        "ora": "^5.1.0",
-        "semver": "^7.3.5",
-        "tar": "^6.0.5",
-        "yargs": "^17.0.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "cliui": {
-          "version": "8.0.1",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-          "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.1",
-            "wrap-ansi": "^7.0.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "fs-extra": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^6.0.1",
-            "universalify": "^2.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "y18n": {
-          "version": "5.0.8",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-          "dev": true
-        },
-        "yargs": {
-          "version": "17.7.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-          "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-          "dev": true,
-          "requires": {
-            "cliui": "^8.0.1",
-            "escalade": "^3.1.1",
-            "get-caller-file": "^2.0.5",
-            "require-directory": "^2.1.1",
-            "string-width": "^4.2.3",
-            "y18n": "^5.0.5",
-            "yargs-parser": "^21.1.1"
-          }
-        },
-        "yargs-parser": {
-          "version": "21.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-          "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-          "dev": true
-        }
-      }
-    },
     "@electron/universal": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.3.4.tgz",
-      "integrity": "sha512-BdhBgm2ZBnYyYRLRgOjM5VHkyFItsbggJ0MHycOjKWdFGYwK97ZFXH54dTvUWEfha81vfvwr5On6XBjt99uDcg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.4.1.tgz",
+      "integrity": "sha512-lE/U3UNw1YHuowNbTmKNs9UlS3En3cPgwM5MI+agIgr/B1hSze9NdOP0qn7boZaI9Lph8IDv3/24g9IxnJP7aQ==",
       "dev": true,
       "requires": {
         "@electron/asar": "^3.2.1",
@@ -50469,17 +50649,6 @@
         "fs-extra": "^9.0.1",
         "minimatch": "^3.0.4",
         "plist": "^3.0.4"
-      },
-      "dependencies": {
-        "@malept/cross-spawn-promise": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz",
-          "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^7.0.1"
-          }
-        }
       }
     },
     "@emotion/use-insertion-effect-with-fallbacks": {
@@ -50871,6 +51040,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": {
@@ -51947,6 +52145,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",
@@ -51974,9 +52264,9 @@
       }
     },
     "@malept/cross-spawn-promise": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz",
-      "integrity": "sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz",
+      "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==",
       "dev": true,
       "requires": {
         "cross-spawn": "^7.0.1"
@@ -52329,6 +52619,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,
@@ -52862,19 +53158,19 @@
       "requires": {}
     },
     "@react-native-community/cli": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-11.3.5.tgz",
-      "integrity": "sha512-wMXgKEWe6uesw7vyXKKjx5EDRog0QdXHxdgRguG14AjQRao1+4gXEWq2yyExOTi/GDY6dfJBUGTCwGQxhnk/Lg==",
-      "requires": {
-        "@react-native-community/cli-clean": "11.3.5",
-        "@react-native-community/cli-config": "11.3.5",
-        "@react-native-community/cli-debugger-ui": "11.3.5",
-        "@react-native-community/cli-doctor": "11.3.5",
-        "@react-native-community/cli-hermes": "11.3.5",
-        "@react-native-community/cli-plugin-metro": "11.3.5",
-        "@react-native-community/cli-server-api": "11.3.5",
-        "@react-native-community/cli-tools": "11.3.5",
-        "@react-native-community/cli-types": "11.3.5",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-11.3.6.tgz",
+      "integrity": "sha512-bdwOIYTBVQ9VK34dsf6t3u6vOUU5lfdhKaAxiAVArjsr7Je88Bgs4sAbsOYsNK3tkE8G77U6wLpekknXcanlww==",
+      "requires": {
+        "@react-native-community/cli-clean": "11.3.6",
+        "@react-native-community/cli-config": "11.3.6",
+        "@react-native-community/cli-debugger-ui": "11.3.6",
+        "@react-native-community/cli-doctor": "11.3.6",
+        "@react-native-community/cli-hermes": "11.3.6",
+        "@react-native-community/cli-plugin-metro": "11.3.6",
+        "@react-native-community/cli-server-api": "11.3.6",
+        "@react-native-community/cli-tools": "11.3.6",
+        "@react-native-community/cli-types": "11.3.6",
         "chalk": "^4.1.2",
         "commander": "^9.4.1",
         "execa": "^5.0.0",
@@ -52882,7 +53178,7 @@
         "fs-extra": "^8.1.0",
         "graceful-fs": "^4.1.3",
         "prompts": "^2.4.0",
-        "semver": "^6.3.0"
+        "semver": "^7.5.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -52981,11 +53277,6 @@
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
           "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
         },
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -53002,11 +53293,11 @@
       }
     },
     "@react-native-community/cli-clean": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-clean/-/cli-clean-11.3.5.tgz",
-      "integrity": "sha512-1+7BU962wKkIkHRp/uW3jYbQKKGtU7L+R3g59D8K6uLccuxJYUBJv18753ojMa6SD3SAq5Xh31bAre+YwVcOTA==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-clean/-/cli-clean-11.3.6.tgz",
+      "integrity": "sha512-jOOaeG5ebSXTHweq1NznVJVAFKtTFWL4lWgUXl845bCGX7t1lL8xQNWHKwT8Oh1pGR2CI3cKmRjY4hBg+pEI9g==",
       "requires": {
-        "@react-native-community/cli-tools": "11.3.5",
+        "@react-native-community/cli-tools": "11.3.6",
         "chalk": "^4.1.2",
         "execa": "^5.0.0",
         "prompts": "^2.4.0"
@@ -53058,11 +53349,11 @@
       }
     },
     "@react-native-community/cli-config": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-config/-/cli-config-11.3.5.tgz",
-      "integrity": "sha512-fMblIsHlUleKfGsgWyjFJYfx1SqrsnhS/QXfA8w7iT6GrNOOjBp5UWx8+xlMDFcmOb9e42g1ExFDKl3n8FWkxQ==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-config/-/cli-config-11.3.6.tgz",
+      "integrity": "sha512-edy7fwllSFLan/6BG6/rznOBCLPrjmJAE10FzkEqNLHowi0bckiAPg1+1jlgQ2qqAxV5kuk+c9eajVfQvPLYDA==",
       "requires": {
-        "@react-native-community/cli-tools": "11.3.5",
+        "@react-native-community/cli-tools": "11.3.6",
         "chalk": "^4.1.2",
         "cosmiconfig": "^5.1.0",
         "deepmerge": "^4.3.0",
@@ -53150,22 +53441,22 @@
       }
     },
     "@react-native-community/cli-debugger-ui": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-11.3.5.tgz",
-      "integrity": "sha512-o5JVCKEpPUXMX4r3p1cYjiy3FgdOEkezZcQ6owWEae2dYvV19lLYyJwnocm9Y7aG9PvpgI3PIMVh3KZbhS21eA==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-11.3.6.tgz",
+      "integrity": "sha512-jhMOSN/iOlid9jn/A2/uf7HbC3u7+lGktpeGSLnHNw21iahFBzcpuO71ekEdlmTZ4zC/WyxBXw9j2ka33T358w==",
       "requires": {
         "serve-static": "^1.13.1"
       }
     },
     "@react-native-community/cli-doctor": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-doctor/-/cli-doctor-11.3.5.tgz",
-      "integrity": "sha512-+4BuFHjoV4FFjX5y60l0s6nS0agidb1izTVwsFixeFKW73LUkOLu+Ae5HI94RAFEPE4ePEVNgYX3FynIau6K0g==",
-      "requires": {
-        "@react-native-community/cli-config": "11.3.5",
-        "@react-native-community/cli-platform-android": "11.3.5",
-        "@react-native-community/cli-platform-ios": "11.3.5",
-        "@react-native-community/cli-tools": "11.3.5",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-doctor/-/cli-doctor-11.3.6.tgz",
+      "integrity": "sha512-UT/Tt6omVPi1j6JEX+CObc85eVFghSZwy4GR9JFMsO7gNg2Tvcu1RGWlUkrbmWMAMHw127LUu6TGK66Ugu1NLA==",
+      "requires": {
+        "@react-native-community/cli-config": "11.3.6",
+        "@react-native-community/cli-platform-android": "11.3.6",
+        "@react-native-community/cli-platform-ios": "11.3.6",
+        "@react-native-community/cli-tools": "11.3.6",
         "chalk": "^4.1.2",
         "command-exists": "^1.2.8",
         "envinfo": "^7.7.2",
@@ -53175,7 +53466,7 @@
         "node-stream-zip": "^1.9.1",
         "ora": "^5.4.1",
         "prompts": "^2.4.0",
-        "semver": "^6.3.0",
+        "semver": "^7.5.2",
         "strip-ansi": "^5.2.0",
         "sudo-prompt": "^9.0.0",
         "wcwidth": "^1.0.1",
@@ -53222,11 +53513,6 @@
           "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
           "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="
         },
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-        },
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -53242,21 +53528,16 @@
           "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=="
         }
       }
     },
     "@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",
-      "integrity": "sha512-+3m34hiaJpFel8BlJE7kJOaPzWR/8U8APZG2LXojbAdBAg99EGmQcwXIgsSVJFvH8h/nezf4DHbsPKigIe33zA==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-hermes/-/cli-hermes-11.3.6.tgz",
+      "integrity": "sha512-O55YAYGZ3XynpUdePPVvNuUPGPY0IJdctLAOHme73OvS80gNwfntHDXfmY70TGHWIfkK2zBhA0B+2v8s5aTyTA==",
       "requires": {
-        "@react-native-community/cli-platform-android": "11.3.5",
-        "@react-native-community/cli-tools": "11.3.5",
+        "@react-native-community/cli-platform-android": "11.3.6",
+        "@react-native-community/cli-tools": "11.3.6",
         "chalk": "^4.1.2",
         "hermes-profile-transformer": "^0.0.6",
         "ip": "^1.1.5"
@@ -53313,11 +53594,11 @@
       }
     },
     "@react-native-community/cli-platform-android": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-android/-/cli-platform-android-11.3.5.tgz",
-      "integrity": "sha512-s4Lj7FKxJ/BofGi/ifjPfrA9MjFwIgYpHnHBSlqtbsvPoSYzmVCU2qlWM8fb3AmkXIwyYt4A6MEr3MmNT2UoBg==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-android/-/cli-platform-android-11.3.6.tgz",
+      "integrity": "sha512-ZARrpLv5tn3rmhZc//IuDM1LSAdYnjUmjrp58RynlvjLDI4ZEjBAGCQmgysRgXAsK7ekMrfkZgemUczfn9td2A==",
       "requires": {
-        "@react-native-community/cli-tools": "11.3.5",
+        "@react-native-community/cli-tools": "11.3.6",
         "chalk": "^4.1.2",
         "execa": "^5.0.0",
         "glob": "^7.1.3",
@@ -53370,11 +53651,11 @@
       }
     },
     "@react-native-community/cli-platform-ios": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-ios/-/cli-platform-ios-11.3.5.tgz",
-      "integrity": "sha512-ytJC/YCFD7P+KuQHOT5Jzh1ho2XbJEjq71yHa1gJP2PG/Q/uB4h1x2XpxDqv5iXU6E250yjvKMmkReKTW4CTig==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-ios/-/cli-platform-ios-11.3.6.tgz",
+      "integrity": "sha512-tZ9VbXWiRW+F+fbZzpLMZlj93g3Q96HpuMsS6DRhrTiG+vMQ3o6oPWSEEmMGOvJSYU7+y68Dc9ms2liC7VD6cw==",
       "requires": {
-        "@react-native-community/cli-tools": "11.3.5",
+        "@react-native-community/cli-tools": "11.3.6",
         "chalk": "^4.1.2",
         "execa": "^5.0.0",
         "fast-xml-parser": "^4.0.12",
@@ -53428,12 +53709,12 @@
       }
     },
     "@react-native-community/cli-plugin-metro": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-plugin-metro/-/cli-plugin-metro-11.3.5.tgz",
-      "integrity": "sha512-r9AekfeLKdblB7LfWB71IrNy1XM03WrByQlUQajUOZAP2NmUUBLl9pMZscPjJeOSgLpHB9ixEFTIOhTabri/qg==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-plugin-metro/-/cli-plugin-metro-11.3.6.tgz",
+      "integrity": "sha512-D97racrPX3069ibyabJNKw9aJpVcaZrkYiEzsEnx50uauQtPDoQ1ELb/5c6CtMhAEGKoZ0B5MS23BbsSZcLs2g==",
       "requires": {
-        "@react-native-community/cli-server-api": "11.3.5",
-        "@react-native-community/cli-tools": "11.3.5",
+        "@react-native-community/cli-server-api": "11.3.6",
+        "@react-native-community/cli-tools": "11.3.6",
         "chalk": "^4.1.2",
         "execa": "^5.0.0",
         "metro": "0.76.7",
@@ -53445,6 +53726,26 @@
         "readline": "^1.3.0"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
+          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.5",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.5.tgz",
+          "integrity": "sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==",
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -53462,6 +53763,21 @@
             "supports-color": "^7.1.0"
           }
         },
+        "ci-info": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+          "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+        },
+        "cliui": {
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+          "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.1",
+            "wrap-ansi": "^7.0.0"
+          }
+        },
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -53475,11 +53791,404 @@
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
         },
+        "cosmiconfig": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+          "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+          "requires": {
+            "import-fresh": "^2.0.0",
+            "is-directory": "^0.3.1",
+            "js-yaml": "^3.13.1",
+            "parse-json": "^4.0.0"
+          }
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
+        "import-fresh": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+          "integrity": "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==",
+          "requires": {
+            "caller-path": "^2.0.0",
+            "resolve-from": "^3.0.0"
+          }
+        },
+        "jest-regex-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
+          "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg=="
+        },
+        "jest-util": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
+          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+          "requires": {
+            "@jest/types": "^27.5.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "ci-info": "^3.2.0",
+            "graceful-fs": "^4.2.9",
+            "picomatch": "^2.2.3"
+          },
+          "dependencies": {
+            "ci-info": {
+              "version": "3.8.0",
+              "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+              "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw=="
+            }
+          }
+        },
+        "jest-worker": {
+          "version": "27.5.1",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+          "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^8.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "8.1.1",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+              "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+              "requires": {
+                "has-flag": "^4.0.0"
+              }
+            }
+          }
+        },
+        "metro": {
+          "version": "0.76.7",
+          "resolved": "https://registry.npmjs.org/metro/-/metro-0.76.7.tgz",
+          "integrity": "sha512-67ZGwDeumEPnrHI+pEDSKH2cx+C81Gx8Mn5qOtmGUPm/Up9Y4I1H2dJZ5n17MWzejNo0XAvPh0QL0CrlJEODVQ==",
+          "requires": {
+            "@babel/code-frame": "^7.0.0",
+            "@babel/core": "^7.20.0",
+            "@babel/generator": "^7.20.0",
+            "@babel/parser": "^7.20.0",
+            "@babel/template": "^7.0.0",
+            "@babel/traverse": "^7.20.0",
+            "@babel/types": "^7.20.0",
+            "accepts": "^1.3.7",
+            "async": "^3.2.2",
+            "chalk": "^4.0.0",
+            "ci-info": "^2.0.0",
+            "connect": "^3.6.5",
+            "debug": "^2.2.0",
+            "denodeify": "^1.2.1",
+            "error-stack-parser": "^2.0.6",
+            "graceful-fs": "^4.2.4",
+            "hermes-parser": "0.12.0",
+            "image-size": "^1.0.2",
+            "invariant": "^2.2.4",
+            "jest-worker": "^27.2.0",
+            "jsc-safe-url": "^0.2.2",
+            "lodash.throttle": "^4.1.1",
+            "metro-babel-transformer": "0.76.7",
+            "metro-cache": "0.76.7",
+            "metro-cache-key": "0.76.7",
+            "metro-config": "0.76.7",
+            "metro-core": "0.76.7",
+            "metro-file-map": "0.76.7",
+            "metro-inspector-proxy": "0.76.7",
+            "metro-minify-terser": "0.76.7",
+            "metro-minify-uglify": "0.76.7",
+            "metro-react-native-babel-preset": "0.76.7",
+            "metro-resolver": "0.76.7",
+            "metro-runtime": "0.76.7",
+            "metro-source-map": "0.76.7",
+            "metro-symbolicate": "0.76.7",
+            "metro-transform-plugins": "0.76.7",
+            "metro-transform-worker": "0.76.7",
+            "mime-types": "^2.1.27",
+            "node-fetch": "^2.2.0",
+            "nullthrows": "^1.1.1",
+            "rimraf": "^3.0.2",
+            "serialize-error": "^2.1.0",
+            "source-map": "^0.5.6",
+            "strip-ansi": "^6.0.0",
+            "throat": "^5.0.0",
+            "ws": "^7.5.1",
+            "yargs": "^17.6.2"
+          }
+        },
+        "metro-babel-transformer": {
+          "version": "0.76.7",
+          "resolved": "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.76.7.tgz",
+          "integrity": "sha512-bgr2OFn0J4r0qoZcHrwEvccF7g9k3wdgTOgk6gmGHrtlZ1Jn3oCpklW/DfZ9PzHfjY2mQammKTc19g/EFGyOJw==",
+          "requires": {
+            "@babel/core": "^7.20.0",
+            "hermes-parser": "0.12.0",
+            "nullthrows": "^1.1.1"
+          }
+        },
+        "metro-cache": {
+          "version": "0.76.7",
+          "resolved": "https://registry.npmjs.org/metro-cache/-/metro-cache-0.76.7.tgz",
+          "integrity": "sha512-nWBMztrs5RuSxZRI7hgFgob5PhYDmxICh9FF8anm9/ito0u0vpPvRxt7sRu8fyeD2AHdXqE7kX32rWY0LiXgeg==",
+          "requires": {
+            "metro-core": "0.76.7",
+            "rimraf": "^3.0.2"
+          }
+        },
+        "metro-cache-key": {
+          "version": "0.76.7",
+          "resolved": "https://registry.npmjs.org/metro-cache-key/-/metro-cache-key-0.76.7.tgz",
+          "integrity": "sha512-0pecoIzwsD/Whn/Qfa+SDMX2YyasV0ndbcgUFx7w1Ct2sLHClujdhQ4ik6mvQmsaOcnGkIyN0zcceMDjC2+BFQ=="
+        },
+        "metro-config": {
+          "version": "0.76.7",
+          "resolved": "https://registry.npmjs.org/metro-config/-/metro-config-0.76.7.tgz",
+          "integrity": "sha512-CFDyNb9bqxZemiChC/gNdXZ7OQkIwmXzkrEXivcXGbgzlt/b2juCv555GWJHyZSlorwnwJfY3uzAFu4A9iRVfg==",
+          "requires": {
+            "connect": "^3.6.5",
+            "cosmiconfig": "^5.0.5",
+            "jest-validate": "^29.2.1",
+            "metro": "0.76.7",
+            "metro-cache": "0.76.7",
+            "metro-core": "0.76.7",
+            "metro-runtime": "0.76.7"
+          }
+        },
+        "metro-core": {
+          "version": "0.76.7",
+          "resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.76.7.tgz",
+          "integrity": "sha512-0b8KfrwPmwCMW+1V7ZQPkTy2tsEKZjYG9Pu1PTsu463Z9fxX7WaR0fcHFshv+J1CnQSUTwIGGjbNvj1teKe+pw==",
+          "requires": {
+            "lodash.throttle": "^4.1.1",
+            "metro-resolver": "0.76.7"
+          }
+        },
+        "metro-file-map": {
+          "version": "0.76.7",
+          "resolved": "https://registry.npmjs.org/metro-file-map/-/metro-file-map-0.76.7.tgz",
+          "integrity": "sha512-s+zEkTcJ4mOJTgEE2ht4jIo1DZfeWreQR3tpT3gDV/Y/0UQ8aJBTv62dE775z0GLsWZApiblAYZsj7ZE8P06nw==",
+          "requires": {
+            "anymatch": "^3.0.3",
+            "debug": "^2.2.0",
+            "fb-watchman": "^2.0.0",
+            "fsevents": "^2.3.2",
+            "graceful-fs": "^4.2.4",
+            "invariant": "^2.2.4",
+            "jest-regex-util": "^27.0.6",
+            "jest-util": "^27.2.0",
+            "jest-worker": "^27.2.0",
+            "micromatch": "^4.0.4",
+            "node-abort-controller": "^3.1.1",
+            "nullthrows": "^1.1.1",
+            "walker": "^1.0.7"
+          }
+        },
+        "metro-inspector-proxy": {
+          "version": "0.76.7",
+          "resolved": "https://registry.npmjs.org/metro-inspector-proxy/-/metro-inspector-proxy-0.76.7.tgz",
+          "integrity": "sha512-rNZ/6edTl/1qUekAhAbaFjczMphM50/UjtxiKulo6vqvgn/Mjd9hVqDvVYfAMZXqPvlusD88n38UjVYPkruLSg==",
+          "requires": {
+            "connect": "^3.6.5",
+            "debug": "^2.2.0",
+            "node-fetch": "^2.2.0",
+            "ws": "^7.5.1",
+            "yargs": "^17.6.2"
+          }
+        },
+        "metro-minify-terser": {
+          "version": "0.76.7",
+          "resolved": "https://registry.npmjs.org/metro-minify-terser/-/metro-minify-terser-0.76.7.tgz",
+          "integrity": "sha512-FQiZGhIxCzhDwK4LxyPMLlq0Tsmla10X7BfNGlYFK0A5IsaVKNJbETyTzhpIwc+YFRT4GkFFwgo0V2N5vxO5HA==",
+          "requires": {
+            "terser": "^5.15.0"
+          }
+        },
+        "metro-minify-uglify": {
+          "version": "0.76.7",
+          "resolved": "https://registry.npmjs.org/metro-minify-uglify/-/metro-minify-uglify-0.76.7.tgz",
+          "integrity": "sha512-FuXIU3j2uNcSvQtPrAJjYWHruPiQ+EpE++J9Z+VznQKEHcIxMMoQZAfIF2IpZSrZYfLOjVFyGMvj41jQMxV1Vw==",
+          "requires": {
+            "uglify-es": "^3.1.9"
+          }
+        },
+        "metro-react-native-babel-preset": {
+          "version": "0.76.7",
+          "resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.76.7.tgz",
+          "integrity": "sha512-R25wq+VOSorAK3hc07NW0SmN8z9S/IR0Us0oGAsBcMZnsgkbOxu77Mduqf+f4is/wnWHc5+9bfiqdLnaMngiVw==",
+          "requires": {
+            "@babel/core": "^7.20.0",
+            "@babel/plugin-proposal-async-generator-functions": "^7.0.0",
+            "@babel/plugin-proposal-class-properties": "^7.18.0",
+            "@babel/plugin-proposal-export-default-from": "^7.0.0",
+            "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.0",
+            "@babel/plugin-proposal-numeric-separator": "^7.0.0",
+            "@babel/plugin-proposal-object-rest-spread": "^7.20.0",
+            "@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
+            "@babel/plugin-proposal-optional-chaining": "^7.20.0",
+            "@babel/plugin-syntax-dynamic-import": "^7.8.0",
+            "@babel/plugin-syntax-export-default-from": "^7.0.0",
+            "@babel/plugin-syntax-flow": "^7.18.0",
+            "@babel/plugin-syntax-nullish-coalescing-operator": "^7.0.0",
+            "@babel/plugin-syntax-optional-chaining": "^7.0.0",
+            "@babel/plugin-transform-arrow-functions": "^7.0.0",
+            "@babel/plugin-transform-async-to-generator": "^7.20.0",
+            "@babel/plugin-transform-block-scoping": "^7.0.0",
+            "@babel/plugin-transform-classes": "^7.0.0",
+            "@babel/plugin-transform-computed-properties": "^7.0.0",
+            "@babel/plugin-transform-destructuring": "^7.20.0",
+            "@babel/plugin-transform-flow-strip-types": "^7.20.0",
+            "@babel/plugin-transform-function-name": "^7.0.0",
+            "@babel/plugin-transform-literals": "^7.0.0",
+            "@babel/plugin-transform-modules-commonjs": "^7.0.0",
+            "@babel/plugin-transform-named-capturing-groups-regex": "^7.0.0",
+            "@babel/plugin-transform-parameters": "^7.0.0",
+            "@babel/plugin-transform-react-display-name": "^7.0.0",
+            "@babel/plugin-transform-react-jsx": "^7.0.0",
+            "@babel/plugin-transform-react-jsx-self": "^7.0.0",
+            "@babel/plugin-transform-react-jsx-source": "^7.0.0",
+            "@babel/plugin-transform-runtime": "^7.0.0",
+            "@babel/plugin-transform-shorthand-properties": "^7.0.0",
+            "@babel/plugin-transform-spread": "^7.0.0",
+            "@babel/plugin-transform-sticky-regex": "^7.0.0",
+            "@babel/plugin-transform-typescript": "^7.5.0",
+            "@babel/plugin-transform-unicode-regex": "^7.0.0",
+            "@babel/template": "^7.0.0",
+            "babel-plugin-transform-flow-enums": "^0.0.2",
+            "react-refresh": "^0.4.0"
+          }
+        },
+        "metro-react-native-babel-transformer": {
+          "version": "0.76.7",
+          "resolved": "https://registry.npmjs.org/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.76.7.tgz",
+          "integrity": "sha512-W6lW3J7y/05ph3c2p3KKJNhH0IdyxdOCbQ5it7aM2MAl0SM4wgKjaV6EYv9b3rHklpV6K3qMH37UKVcjMooWiA==",
+          "requires": {
+            "@babel/core": "^7.20.0",
+            "babel-preset-fbjs": "^3.4.0",
+            "hermes-parser": "0.12.0",
+            "metro-react-native-babel-preset": "0.76.7",
+            "nullthrows": "^1.1.1"
+          }
+        },
+        "metro-resolver": {
+          "version": "0.76.7",
+          "resolved": "https://registry.npmjs.org/metro-resolver/-/metro-resolver-0.76.7.tgz",
+          "integrity": "sha512-pC0Wgq29HHIHrwz23xxiNgylhI8Rq1V01kQaJ9Kz11zWrIdlrH0ZdnJ7GC6qA0ErROG+cXmJ0rJb8/SW1Zp2IA=="
+        },
+        "metro-runtime": {
+          "version": "0.76.7",
+          "resolved": "https://registry.npmjs.org/metro-runtime/-/metro-runtime-0.76.7.tgz",
+          "integrity": "sha512-MuWHubQHymUWBpZLwuKZQgA/qbb35WnDAKPo83rk7JRLIFPvzXSvFaC18voPuzJBt1V98lKQIonh6MiC9gd8Ug==",
+          "requires": {
+            "@babel/runtime": "^7.0.0",
+            "react-refresh": "^0.4.0"
+          }
+        },
+        "metro-source-map": {
+          "version": "0.76.7",
+          "resolved": "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.76.7.tgz",
+          "integrity": "sha512-Prhx7PeRV1LuogT0Kn5VjCuFu9fVD68eefntdWabrksmNY6mXK8pRqzvNJOhTojh6nek+RxBzZeD6MIOOyXS6w==",
+          "requires": {
+            "@babel/traverse": "^7.20.0",
+            "@babel/types": "^7.20.0",
+            "invariant": "^2.2.4",
+            "metro-symbolicate": "0.76.7",
+            "nullthrows": "^1.1.1",
+            "ob1": "0.76.7",
+            "source-map": "^0.5.6",
+            "vlq": "^1.0.0"
+          }
+        },
+        "metro-symbolicate": {
+          "version": "0.76.7",
+          "resolved": "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.76.7.tgz",
+          "integrity": "sha512-p0zWEME5qLSL1bJb93iq+zt5fz3sfVn9xFYzca1TJIpY5MommEaS64Va87lp56O0sfEIvh4307Oaf/ZzRjuLiQ==",
+          "requires": {
+            "invariant": "^2.2.4",
+            "metro-source-map": "0.76.7",
+            "nullthrows": "^1.1.1",
+            "source-map": "^0.5.6",
+            "through2": "^2.0.1",
+            "vlq": "^1.0.0"
+          }
+        },
+        "metro-transform-plugins": {
+          "version": "0.76.7",
+          "resolved": "https://registry.npmjs.org/metro-transform-plugins/-/metro-transform-plugins-0.76.7.tgz",
+          "integrity": "sha512-iSmnjVApbdivjuzb88Orb0JHvcEt5veVyFAzxiS5h0QB+zV79w6JCSqZlHCrbNOkOKBED//LqtKbFVakxllnNg==",
+          "requires": {
+            "@babel/core": "^7.20.0",
+            "@babel/generator": "^7.20.0",
+            "@babel/template": "^7.0.0",
+            "@babel/traverse": "^7.20.0",
+            "nullthrows": "^1.1.1"
+          }
+        },
+        "metro-transform-worker": {
+          "version": "0.76.7",
+          "resolved": "https://registry.npmjs.org/metro-transform-worker/-/metro-transform-worker-0.76.7.tgz",
+          "integrity": "sha512-cGvELqFMVk9XTC15CMVzrCzcO6sO1lURfcbgjuuPdzaWuD11eEyocvkTX0DPiRjsvgAmicz4XYxVzgYl3MykDw==",
+          "requires": {
+            "@babel/core": "^7.20.0",
+            "@babel/generator": "^7.20.0",
+            "@babel/parser": "^7.20.0",
+            "@babel/types": "^7.20.0",
+            "babel-preset-fbjs": "^3.4.0",
+            "metro": "0.76.7",
+            "metro-babel-transformer": "0.76.7",
+            "metro-cache": "0.76.7",
+            "metro-cache-key": "0.76.7",
+            "metro-source-map": "0.76.7",
+            "metro-transform-plugins": "0.76.7",
+            "nullthrows": "^1.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        },
+        "ob1": {
+          "version": "0.76.7",
+          "resolved": "https://registry.npmjs.org/ob1/-/ob1-0.76.7.tgz",
+          "integrity": "sha512-BQdRtxxoUNfSoZxqeBGOyuT9nEYSn18xZHwGMb0mMVpn2NBcYbnyKY4BK2LIHRgw33CBGlUmE+KMaNvyTpLLtQ=="
+        },
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+          "requires": {
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
+          }
+        },
+        "react-refresh": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.3.tgz",
+          "integrity": "sha512-Hwln1VNuGl/6bVwnd0Xdn1e84gT/8T9aYNL+HAKDArLCS7LWjwr7StE30IEYbIkx0Vi3vs+coQxe+SQDbGbbpA=="
+        },
+        "resolve-from": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+          "integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw=="
+        },
+        "serialize-error": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz",
+          "integrity": "sha512-ghgmKt5o4Tly5yEG/UJp8qTd0AN7Xalw4XBtDEKP655B699qMEtra1WlXeE6WIvdEG481JvRxULKsInq/iNysw=="
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -53487,16 +54196,46 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "ws": {
+          "version": "7.5.9",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+          "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+          "requires": {}
+        },
+        "y18n": {
+          "version": "5.0.8",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
+        },
+        "yargs": {
+          "version": "17.7.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+          "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+          "requires": {
+            "cliui": "^8.0.1",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
+            "require-directory": "^2.1.1",
+            "string-width": "^4.2.3",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^21.1.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "21.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+          "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
         }
       }
     },
     "@react-native-community/cli-server-api": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-server-api/-/cli-server-api-11.3.5.tgz",
-      "integrity": "sha512-PM/jF13uD1eAKuC84lntNuM5ZvJAtyb+H896P1dBIXa9boPLa3KejfUvNVoyOUJ5s8Ht25JKbc3yieV2+GMBDA==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-server-api/-/cli-server-api-11.3.6.tgz",
+      "integrity": "sha512-8GUKodPnURGtJ9JKg8yOHIRtWepPciI3ssXVw5jik7+dZ43yN8P5BqCoDaq8e1H1yRer27iiOfT7XVnwk8Dueg==",
       "requires": {
-        "@react-native-community/cli-debugger-ui": "11.3.5",
-        "@react-native-community/cli-tools": "11.3.5",
+        "@react-native-community/cli-debugger-ui": "11.3.6",
+        "@react-native-community/cli-tools": "11.3.6",
         "compression": "^1.7.1",
         "connect": "^3.6.5",
         "errorhandler": "^1.5.1",
@@ -53557,9 +54296,9 @@
       }
     },
     "@react-native-community/cli-tools": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-tools/-/cli-tools-11.3.5.tgz",
-      "integrity": "sha512-zDklE1+ah/zL4BLxut5XbzqCj9KTHzbYBKX7//cXw2/0TpkNCaY9c+iKx//gZ5m7U1OKbb86Fm2b0AKtKVRf6Q==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-tools/-/cli-tools-11.3.6.tgz",
+      "integrity": "sha512-JpmUTcDwAGiTzLsfMlIAYpCMSJ9w2Qlf7PU7mZIRyEu61UzEawyw83DkqfbzDPBuRwRnaeN44JX2CP/yTO3ThQ==",
       "requires": {
         "appdirsjs": "^1.2.4",
         "chalk": "^4.1.2",
@@ -53568,7 +54307,7 @@
         "node-fetch": "^2.6.0",
         "open": "^6.2.0",
         "ora": "^5.4.1",
-        "semver": "^6.3.0",
+        "semver": "^7.5.2",
         "shell-quote": "^1.7.3"
       },
       "dependencies": {
@@ -53620,11 +54359,6 @@
             "is-wsl": "^1.1.0"
           }
         },
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -53636,9 +54370,9 @@
       }
     },
     "@react-native-community/cli-types": {
-      "version": "11.3.5",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-types/-/cli-types-11.3.5.tgz",
-      "integrity": "sha512-pf0kdWMEfPSV/+8rcViDCFzbLMtWIHMZ8ay7hKwqaoWegsJ0oprSF2tSTH+LSC/7X1Beb9ssIvHj1m5C4es5Xg==",
+      "version": "11.3.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-types/-/cli-types-11.3.6.tgz",
+      "integrity": "sha512-6DxjrMKx5x68N/tCJYVYRKAtlRHbtUVBZrnAvkxbRWFD9v4vhNgsPM0RQm8i2vRugeksnao5mbnRGpS6c0awCw==",
       "requires": {
         "joi": "^17.2.1"
       }
@@ -53782,15 +54516,15 @@
       "version": "0.72.1"
     },
     "@react-native/metro-config": {
-      "version": "0.72.9",
-      "resolved": "https://registry.npmjs.org/@react-native/metro-config/-/metro-config-0.72.9.tgz",
-      "integrity": "sha512-5MGmyDnXPeprRuvgPGE4LZ+e+ovofSd5YY6nFDwg6wbjRGOkeCRRlaTlQT+fjmv+zr4vYG+MUTKBlaO+fui/vA==",
+      "version": "0.72.11",
+      "resolved": "https://registry.npmjs.org/@react-native/metro-config/-/metro-config-0.72.11.tgz",
+      "integrity": "sha512-661EyQnDdVelyc0qP/ew7kKkGAh6N6KlkuPLC2SQ8sxaXskVU6fSuNlpLW4bUTBUDFKG8gEOU2hp6rzk4wQnGQ==",
       "dev": true,
       "requires": {
         "@react-native/js-polyfills": "^0.72.1",
-        "metro-config": "0.76.7",
-        "metro-react-native-babel-transformer": "0.76.7",
-        "metro-runtime": "0.76.7"
+        "metro-config": "0.76.8",
+        "metro-react-native-babel-transformer": "0.76.8",
+        "metro-runtime": "0.76.8"
       }
     },
     "@react-native/normalize-color": {
@@ -53802,9 +54536,9 @@
       "integrity": "sha512-285lfdqSXaqKuBbbtP9qL2tDrfxdOFtIMvkKadtleRQkdOxx+uzGvFr82KHmc/sSiMtfXGp7JnFYWVh4sFl7Yw=="
     },
     "@react-native/virtualized-lists": {
-      "version": "0.72.6",
-      "resolved": "https://registry.npmjs.org/@react-native/virtualized-lists/-/virtualized-lists-0.72.6.tgz",
-      "integrity": "sha512-JhT6ydu35LvbSKdwnhWDuGHMOwM0WAh9oza/X8vXHA8ELHRyQ/4p8eKz/bTQcbQziJaaleUURToGhFuCtgiMoA==",
+      "version": "0.72.8",
+      "resolved": "https://registry.npmjs.org/@react-native/virtualized-lists/-/virtualized-lists-0.72.8.tgz",
+      "integrity": "sha512-J3Q4Bkuo99k7mu+jPS9gSUSgq+lLRSI/+ahXNwV92XgJ/8UgOTxu2LPwhJnBk/sQKxq7E8WkZBnBiozukQMqrw==",
       "requires": {
         "invariant": "^2.2.4",
         "nullthrows": "^1.1.1"
@@ -61899,7 +62633,9 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "abort-controller": {
       "version": "3.0.0",
@@ -61950,6 +62686,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,
@@ -61957,17 +62699,6 @@
         "debug": "4"
       }
     },
-    "agentkeepalive": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.3.0.tgz",
-      "integrity": "sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.0",
-        "depd": "^2.0.0",
-        "humanize-ms": "^1.2.1"
-      }
-    },
     "aggregate-error": {
       "version": "3.1.0",
       "dev": true,
@@ -62161,16 +62892,15 @@
       "dev": true
     },
     "app-builder-lib": {
-      "version": "24.5.0",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.5.0.tgz",
-      "integrity": "sha512-f8R0aWIl5/JVipwP9QvEDIuebo191zGTco/aEdJQpMinQaIZSIS3U8kt1vZxYe7kGXZ3S0zNf6h7SMcWKRLzcQ==",
+      "version": "24.6.4",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.6.4.tgz",
+      "integrity": "sha512-m9931WXb83teb32N0rKg+ulbn6+Hl8NV5SUpVDOVz9MWOXfhV6AQtTdftf51zJJvCQnQugGtSqoLvgw6mdF/Rg==",
       "dev": true,
       "requires": {
         "@develar/schema-utils": "~2.6.5",
-        "@electron/notarize": "^1.2.3",
-        "@electron/osx-sign": "^1.0.4",
-        "@electron/rebuild": "^3.2.13",
-        "@electron/universal": "1.3.4",
+        "@electron/notarize": "2.1.0",
+        "@electron/osx-sign": "1.0.5",
+        "@electron/universal": "1.4.1",
         "@malept/flatpak-bundler": "^0.4.0",
         "@types/fs-extra": "9.0.13",
         "7zip-bin": "~5.1.1",
@@ -62197,6 +62927,31 @@
         "temp-file": "^3.4.0"
       },
       "dependencies": {
+        "@electron/notarize": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.1.0.tgz",
+          "integrity": "sha512-Q02xem1D0sg4v437xHgmBLxI2iz/fc0D4K7fiVWHa/AnW8o7D751xyKNXgziA6HrTOme9ul1JfWN5ark8WH1xA==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.1.1",
+            "fs-extra": "^9.0.1",
+            "promise-retry": "^2.0.1"
+          },
+          "dependencies": {
+            "fs-extra": {
+              "version": "9.1.0",
+              "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+              "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+              "dev": true,
+              "requires": {
+                "at-least-node": "^1.0.0",
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+              }
+            }
+          }
+        },
         "argparse": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -62993,7 +63748,9 @@
       "dev": true
     },
     "babel-plugin-syntax-trailing-function-commas": {
-      "version": "7.0.0-beta.0"
+      "version": "7.0.0-beta.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz",
+      "integrity": "sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ=="
     },
     "babel-plugin-transform-class-properties": {
       "version": "6.24.1",
@@ -63050,6 +63807,8 @@
     },
     "babel-preset-fbjs": {
       "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-fbjs/-/babel-preset-fbjs-3.4.0.tgz",
+      "integrity": "sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow==",
       "requires": {
         "@babel/plugin-proposal-class-properties": "^7.0.0",
         "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
@@ -63236,6 +63995,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
@@ -64099,9 +64888,9 @@
       }
     },
     "cli-spinners": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.0.tgz",
-      "integrity": "sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g=="
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.1.tgz",
+      "integrity": "sha512-jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ=="
     },
     "cli-table3": {
       "version": "0.6.3",
@@ -64211,6 +65000,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"
     },
@@ -64414,6 +65209,8 @@
     },
     "connect": {
       "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
+      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
       "requires": {
         "debug": "2.6.9",
         "finalhandler": "1.1.2",
@@ -64423,12 +65220,16 @@
       "dependencies": {
         "debug": {
           "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "requires": {
             "ms": "2.0.0"
           }
         },
         "finalhandler": {
           "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+          "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
           "requires": {
             "debug": "2.6.9",
             "encodeurl": "~1.0.2",
@@ -64440,16 +65241,22 @@
           }
         },
         "ms": {
-          "version": "2.0.0"
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         },
         "on-finished": {
           "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+          "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
           "requires": {
             "ee-first": "1.1.1"
           }
         },
         "statuses": {
-          "version": "1.5.0"
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+          "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="
         }
       }
     },
@@ -64645,6 +65452,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": {
@@ -65373,7 +66188,9 @@
       "dev": true
     },
     "denodeify": {
-      "version": "1.2.1"
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/denodeify/-/denodeify-1.2.1.tgz",
+      "integrity": "sha512-KNTihKNmQENUZeKu5fzfpzRqR5S2VMp4gl9RFHiWzj9DfvYQPMJ6XHKNaQxaGCXwPk6y9yme3aUoaiAe+KX+vg=="
     },
     "depd": {
       "version": "2.0.0"
@@ -65417,7 +66234,9 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
       "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "detect-newline": {
       "version": "3.1.0"
@@ -65498,12 +66317,12 @@
       }
     },
     "dmg-builder": {
-      "version": "24.5.0",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.5.0.tgz",
-      "integrity": "sha512-xQHaXMALL85hQJVR2CKMmN8xibjwo2Ukjpj7aape/mAfE+w7E5RNg0nD/RVQ5uj5AHPySVFHiCGrAkjXjUPOcw==",
+      "version": "24.6.4",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.6.4.tgz",
+      "integrity": "sha512-BNcHRc9CWEuI9qt0E655bUBU/j/3wUCYBVKGu1kVpbN5lcUdEJJJeiO0NHK3dgKmra6LUUZlo+mWqc+OCbi0zw==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "24.5.0",
+        "app-builder-lib": "24.6.4",
         "builder-util": "24.5.0",
         "builder-util-runtime": "9.2.1",
         "dmg-license": "^1.0.11",
@@ -65715,9 +66534,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",
@@ -65726,21 +66545,21 @@
       }
     },
     "electron-builder": {
-      "version": "24.5.0",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.5.0.tgz",
-      "integrity": "sha512-IyF6aYq5zcTz15ZkUK/PuFs3nW/fSR68ZgC/3ac32exw4ivQI0FlZLIEkJLpfI43pUFTtnvwv9Wsm1iDSf9aPw==",
+      "version": "24.6.4",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.6.4.tgz",
+      "integrity": "sha512-uNWQoU7pE7qOaIQ6CJHpBi44RJFVG8OHRBIadUxrsDJVwLLo8Nma3K/EEtx5/UyWAQYdcK4nVPYKoRqBb20hbA==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "24.5.0",
+        "app-builder-lib": "24.6.4",
         "builder-util": "24.5.0",
         "builder-util-runtime": "9.2.1",
         "chalk": "^4.1.2",
-        "dmg-builder": "24.5.0",
+        "dmg-builder": "24.6.4",
         "fs-extra": "^10.1.0",
         "is-ci": "^3.0.0",
         "lazy-val": "^1.0.5",
         "read-config-file": "6.3.2",
-        "simple-update-notifier": "^1.1.0",
+        "simple-update-notifier": "2.0.0",
         "yargs": "^17.6.2"
       },
       "dependencies": {
@@ -65957,6 +66776,7 @@
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
       "optional": true,
+      "peer": true,
       "requires": {
         "iconv-lite": "^0.6.2"
       }
@@ -66449,9 +67269,9 @@
       }
     },
     "eslint-config-expensify": {
-      "version": "2.0.38",
-      "resolved": "https://registry.npmjs.org/eslint-config-expensify/-/eslint-config-expensify-2.0.38.tgz",
-      "integrity": "sha512-jAlrYSjkDV8YESUUPcaTjUM8Fgru+37FS+Hq6zzcRR0FbA5bLiOPguhJHo77XpYh5N+PEf4wrpgsS04sjdgDPg==",
+      "version": "2.0.39",
+      "resolved": "https://registry.npmjs.org/eslint-config-expensify/-/eslint-config-expensify-2.0.39.tgz",
+      "integrity": "sha512-DIxR3k99ZIDPE2NK+WLLRWpoDq06gTXdY8XZg9Etd1UqZ7fXm/Yz3/QkTxu7CH7UaXbCH3P4PTo023ULQGKOSw==",
       "dev": true,
       "requires": {
         "@lwc/eslint-plugin-lwc": "^0.11.0",
@@ -67438,9 +68258,9 @@
       }
     },
     "expensify-common": {
-      "version": "git+ssh://git@github.com/Expensify/expensify-common.git#e63d06e239fe5b2f221e86eab71ae8a4e3b8bee3",
-      "integrity": "sha512-ufptwN4Ef0JiBwvit3qN9zY8y6gFQHlMJWe+Poc0cQ0XcAuYIFSxbE0cAojMuRw7eA1to87JKKF028APIXRM/Q==",
-      "from": "expensify-common@git+ssh://git@github.com/Expensify/expensify-common.git#e63d06e239fe5b2f221e86eab71ae8a4e3b8bee3",
+      "version": "git+ssh://git@github.com/Expensify/expensify-common.git#1609f1848cc0c2528064519c3ea48b4953a708ee",
+      "integrity": "sha512-sUd/ky6xCB/mShVaD2nVkedGL2xy+h6Jf5MfX9GOiYX8wB2D8uZSpqswz515uwcp8RDWrA5wxM2cR6pBXNfgxw==",
+      "from": "expensify-common@git+ssh://git@github.com/Expensify/expensify-common.git#1609f1848cc0c2528064519c3ea48b4953a708ee",
       "requires": {
         "classnames": "2.3.1",
         "clipboard": "2.0.4",
@@ -67498,12 +68318,6 @@
         }
       }
     },
-    "exponential-backoff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
-      "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==",
-      "dev": true
-    },
     "express": {
       "version": "4.18.1",
       "dev": true,
@@ -67996,7 +68810,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.15.1",
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
       "dev": true
     },
     "for-each": {
@@ -68112,6 +68928,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
         }
       }
     },
@@ -68973,15 +69795,6 @@
     "human-signals": {
       "version": "2.1.0"
     },
-    "humanize-ms": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
-      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
-      "dev": true,
-      "requires": {
-        "ms": "^2.0.0"
-      }
-    },
     "husky": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/husky/-/husky-1.3.1.tgz",
@@ -69638,12 +70451,6 @@
       "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
       "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="
     },
-    "is-lambda": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
-      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
-      "dev": true
-    },
     "is-map": {
       "version": "2.0.2",
       "dev": true
@@ -71483,9 +72290,9 @@
       }
     },
     "joi": {
-      "version": "17.9.2",
-      "resolved": "https://registry.npmjs.org/joi/-/joi-17.9.2.tgz",
-      "integrity": "sha512-Itk/r+V4Dx0V3c7RLFdRh12IOjySm2/WGPMubBT92cQvRfYZhPM2W0hZlctjj72iES8jsRCwp7S/cRmWBnJ4nw==",
+      "version": "17.10.1",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-17.10.1.tgz",
+      "integrity": "sha512-vIiDxQKmRidUVp8KngT8MZSOcmRVm2zV7jbMjNYWuHcJWI0bUck3nRTGQjhpPlQenIQIBC5Vp9AhcnHbWQqafw==",
       "requires": {
         "@hapi/hoek": "^9.0.0",
         "@hapi/topo": "^5.0.0",
@@ -71943,7 +72750,9 @@
       "dev": true
     },
     "lodash.throttle": {
-      "version": "4.1.1"
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
+      "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
     },
     "lodash.truncate": {
       "version": "4.4.2",
@@ -72223,179 +73032,6 @@
       "resolved": "https://registry.npmjs.org/make-event-props/-/make-event-props-1.6.1.tgz",
       "integrity": "sha512-JhvWq/iz1BvlmnPvLJjXv+xnMPJZuychrDC68V+yCGQJn5chcA8rLGKo5EP1XwIKVrigSXKLmbeXAGkf36wdCQ=="
     },
-    "make-fetch-happen": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz",
-      "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==",
-      "dev": true,
-      "requires": {
-        "agentkeepalive": "^4.2.1",
-        "cacache": "^17.0.0",
-        "http-cache-semantics": "^4.1.1",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.0",
-        "is-lambda": "^1.0.1",
-        "lru-cache": "^7.7.1",
-        "minipass": "^5.0.0",
-        "minipass-fetch": "^3.0.0",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.4",
-        "negotiator": "^0.6.3",
-        "promise-retry": "^2.0.1",
-        "socks-proxy-agent": "^7.0.0",
-        "ssri": "^10.0.0"
-      },
-      "dependencies": {
-        "@npmcli/fs": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz",
-          "integrity": "sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==",
-          "dev": true,
-          "requires": {
-            "semver": "^7.3.5"
-          }
-        },
-        "brace-expansion": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-          "dev": true,
-          "requires": {
-            "balanced-match": "^1.0.0"
-          }
-        },
-        "cacache": {
-          "version": "17.1.4",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz",
-          "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==",
-          "dev": true,
-          "requires": {
-            "@npmcli/fs": "^3.1.0",
-            "fs-minipass": "^3.0.0",
-            "glob": "^10.2.2",
-            "lru-cache": "^7.7.1",
-            "minipass": "^7.0.3",
-            "minipass-collect": "^1.0.2",
-            "minipass-flush": "^1.0.5",
-            "minipass-pipeline": "^1.2.4",
-            "p-map": "^4.0.0",
-            "ssri": "^10.0.0",
-            "tar": "^6.1.11",
-            "unique-filename": "^3.0.0"
-          },
-          "dependencies": {
-            "minipass": {
-              "version": "7.0.3",
-              "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz",
-              "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==",
-              "dev": true
-            }
-          }
-        },
-        "foreground-child": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-          "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^7.0.0",
-            "signal-exit": "^4.0.1"
-          }
-        },
-        "fs-minipass": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
-          "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
-          "dev": true,
-          "requires": {
-            "minipass": "^7.0.3"
-          },
-          "dependencies": {
-            "minipass": {
-              "version": "7.0.3",
-              "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz",
-              "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==",
-              "dev": true
-            }
-          }
-        },
-        "glob": {
-          "version": "10.3.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz",
-          "integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==",
-          "dev": true,
-          "requires": {
-            "foreground-child": "^3.1.0",
-            "jackspeak": "^2.0.3",
-            "minimatch": "^9.0.1",
-            "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-            "path-scurry": "^1.10.1"
-          }
-        },
-        "lru-cache": {
-          "version": "7.18.3",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-          "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "9.0.3",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-          "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^2.0.1"
-          }
-        },
-        "minipass": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-          "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-          "dev": true
-        },
-        "signal-exit": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-          "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-          "dev": true
-        },
-        "ssri": {
-          "version": "10.0.5",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.5.tgz",
-          "integrity": "sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==",
-          "dev": true,
-          "requires": {
-            "minipass": "^7.0.3"
-          },
-          "dependencies": {
-            "minipass": {
-              "version": "7.0.3",
-              "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz",
-              "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==",
-              "dev": true
-            }
-          }
-        },
-        "unique-filename": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz",
-          "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==",
-          "dev": true,
-          "requires": {
-            "unique-slug": "^4.0.0"
-          }
-        },
-        "unique-slug": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz",
-          "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==",
-          "dev": true,
-          "requires": {
-            "imurmurhash": "^0.1.4"
-          }
-        }
-      }
-    },
     "makeerror": {
       "version": "1.0.12",
       "requires": {
@@ -73120,9 +73756,10 @@
       "dev": true
     },
     "metro": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro/-/metro-0.76.7.tgz",
-      "integrity": "sha512-67ZGwDeumEPnrHI+pEDSKH2cx+C81Gx8Mn5qOtmGUPm/Up9Y4I1H2dJZ5n17MWzejNo0XAvPh0QL0CrlJEODVQ==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro/-/metro-0.76.8.tgz",
+      "integrity": "sha512-oQA3gLzrrYv3qKtuWArMgHPbHu8odZOD9AoavrqSFllkPgOtmkBvNNDLCELqv5SjBfqjISNffypg+5UGG3y0pg==",
+      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
         "@babel/core": "^7.20.0",
@@ -73146,22 +73783,22 @@
         "jest-worker": "^27.2.0",
         "jsc-safe-url": "^0.2.2",
         "lodash.throttle": "^4.1.1",
-        "metro-babel-transformer": "0.76.7",
-        "metro-cache": "0.76.7",
-        "metro-cache-key": "0.76.7",
-        "metro-config": "0.76.7",
-        "metro-core": "0.76.7",
-        "metro-file-map": "0.76.7",
-        "metro-inspector-proxy": "0.76.7",
-        "metro-minify-terser": "0.76.7",
-        "metro-minify-uglify": "0.76.7",
-        "metro-react-native-babel-preset": "0.76.7",
-        "metro-resolver": "0.76.7",
-        "metro-runtime": "0.76.7",
-        "metro-source-map": "0.76.7",
-        "metro-symbolicate": "0.76.7",
-        "metro-transform-plugins": "0.76.7",
-        "metro-transform-worker": "0.76.7",
+        "metro-babel-transformer": "0.76.8",
+        "metro-cache": "0.76.8",
+        "metro-cache-key": "0.76.8",
+        "metro-config": "0.76.8",
+        "metro-core": "0.76.8",
+        "metro-file-map": "0.76.8",
+        "metro-inspector-proxy": "0.76.8",
+        "metro-minify-terser": "0.76.8",
+        "metro-minify-uglify": "0.76.8",
+        "metro-react-native-babel-preset": "0.76.8",
+        "metro-resolver": "0.76.8",
+        "metro-runtime": "0.76.8",
+        "metro-source-map": "0.76.8",
+        "metro-symbolicate": "0.76.8",
+        "metro-transform-plugins": "0.76.8",
+        "metro-transform-worker": "0.76.8",
         "mime-types": "^2.1.27",
         "node-fetch": "^2.2.0",
         "nullthrows": "^1.1.1",
@@ -73178,6 +73815,7 @@
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
           "requires": {
             "color-convert": "^2.0.1"
           }
@@ -73186,6 +73824,7 @@
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
           "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
@@ -73194,12 +73833,14 @@
         "ci-info": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-          "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+          "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+          "dev": true
         },
         "cliui": {
           "version": "8.0.1",
           "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
           "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+          "dev": true,
           "requires": {
             "string-width": "^4.2.0",
             "strip-ansi": "^6.0.1",
@@ -73210,6 +73851,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
           "requires": {
             "color-name": "~1.1.4"
           }
@@ -73217,12 +73859,14 @@
         "color-name": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
         },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
@@ -73230,12 +73874,14 @@
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
         },
         "jest-worker": {
           "version": "27.5.1",
           "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
           "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+          "dev": true,
           "requires": {
             "@types/node": "*",
             "merge-stream": "^2.0.0",
@@ -73246,6 +73892,7 @@
               "version": "8.1.1",
               "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
               "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+              "dev": true,
               "requires": {
                 "has-flag": "^4.0.0"
               }
@@ -73255,22 +73902,26 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
         },
         "serialize-error": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz",
-          "integrity": "sha512-ghgmKt5o4Tly5yEG/UJp8qTd0AN7Xalw4XBtDEKP655B699qMEtra1WlXeE6WIvdEG481JvRxULKsInq/iNysw=="
+          "integrity": "sha512-ghgmKt5o4Tly5yEG/UJp8qTd0AN7Xalw4XBtDEKP655B699qMEtra1WlXeE6WIvdEG481JvRxULKsInq/iNysw==",
+          "dev": true
         },
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
+          "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+          "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
@@ -73279,17 +73930,20 @@
           "version": "7.5.9",
           "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
           "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+          "dev": true,
           "requires": {}
         },
         "y18n": {
           "version": "5.0.8",
           "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
+          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+          "dev": true
         },
         "yargs": {
           "version": "17.7.2",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
           "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+          "dev": true,
           "requires": {
             "cliui": "^8.0.1",
             "escalade": "^3.1.1",
@@ -73303,14 +73957,16 @@
         "yargs-parser": {
           "version": "21.1.1",
           "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-          "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
+          "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+          "dev": true
         }
       }
     },
     "metro-babel-transformer": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.76.7.tgz",
-      "integrity": "sha512-bgr2OFn0J4r0qoZcHrwEvccF7g9k3wdgTOgk6gmGHrtlZ1Jn3oCpklW/DfZ9PzHfjY2mQammKTc19g/EFGyOJw==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.76.8.tgz",
+      "integrity": "sha512-Hh6PW34Ug/nShlBGxkwQJSgPGAzSJ9FwQXhUImkzdsDgVu6zj5bx258J8cJVSandjNoQ8nbaHK6CaHlnbZKbyA==",
+      "dev": true,
       "requires": {
         "@babel/core": "^7.20.0",
         "hermes-parser": "0.12.0",
@@ -73318,37 +73974,41 @@
       }
     },
     "metro-cache": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-cache/-/metro-cache-0.76.7.tgz",
-      "integrity": "sha512-nWBMztrs5RuSxZRI7hgFgob5PhYDmxICh9FF8anm9/ito0u0vpPvRxt7sRu8fyeD2AHdXqE7kX32rWY0LiXgeg==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-cache/-/metro-cache-0.76.8.tgz",
+      "integrity": "sha512-QBJSJIVNH7Hc/Yo6br/U/qQDUpiUdRgZ2ZBJmvAbmAKp2XDzsapnMwK/3BGj8JNWJF7OLrqrYHsRsukSbUBpvQ==",
+      "dev": true,
       "requires": {
-        "metro-core": "0.76.7",
+        "metro-core": "0.76.8",
         "rimraf": "^3.0.2"
       }
     },
     "metro-cache-key": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-cache-key/-/metro-cache-key-0.76.7.tgz",
-      "integrity": "sha512-0pecoIzwsD/Whn/Qfa+SDMX2YyasV0ndbcgUFx7w1Ct2sLHClujdhQ4ik6mvQmsaOcnGkIyN0zcceMDjC2+BFQ=="
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-cache-key/-/metro-cache-key-0.76.8.tgz",
+      "integrity": "sha512-buKQ5xentPig9G6T37Ww/R/bC+/V1MA5xU/D8zjnhlelsrPG6w6LtHUS61ID3zZcMZqYaELWk5UIadIdDsaaLw==",
+      "dev": true
     },
     "metro-config": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-config/-/metro-config-0.76.7.tgz",
-      "integrity": "sha512-CFDyNb9bqxZemiChC/gNdXZ7OQkIwmXzkrEXivcXGbgzlt/b2juCv555GWJHyZSlorwnwJfY3uzAFu4A9iRVfg==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-config/-/metro-config-0.76.8.tgz",
+      "integrity": "sha512-SL1lfKB0qGHALcAk2zBqVgQZpazDYvYFGwCK1ikz0S6Y/CM2i2/HwuZN31kpX6z3mqjv/6KvlzaKoTb1otuSAA==",
+      "dev": true,
       "requires": {
         "connect": "^3.6.5",
         "cosmiconfig": "^5.0.5",
         "jest-validate": "^29.2.1",
-        "metro": "0.76.7",
-        "metro-cache": "0.76.7",
-        "metro-core": "0.76.7",
-        "metro-runtime": "0.76.7"
+        "metro": "0.76.8",
+        "metro-cache": "0.76.8",
+        "metro-core": "0.76.8",
+        "metro-runtime": "0.76.8"
       },
       "dependencies": {
         "cosmiconfig": {
           "version": "5.2.1",
           "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
           "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+          "dev": true,
           "requires": {
             "import-fresh": "^2.0.0",
             "is-directory": "^0.3.1",
@@ -73360,6 +74020,7 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
           "integrity": "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==",
+          "dev": true,
           "requires": {
             "caller-path": "^2.0.0",
             "resolve-from": "^3.0.0"
@@ -73369,6 +74030,7 @@
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
           "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+          "dev": true,
           "requires": {
             "error-ex": "^1.3.1",
             "json-parse-better-errors": "^1.0.1"
@@ -73377,23 +74039,26 @@
         "resolve-from": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-          "integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw=="
+          "integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==",
+          "dev": true
         }
       }
     },
     "metro-core": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.76.7.tgz",
-      "integrity": "sha512-0b8KfrwPmwCMW+1V7ZQPkTy2tsEKZjYG9Pu1PTsu463Z9fxX7WaR0fcHFshv+J1CnQSUTwIGGjbNvj1teKe+pw==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.76.8.tgz",
+      "integrity": "sha512-sl2QLFI3d1b1XUUGxwzw/KbaXXU/bvFYrSKz6Sg19AdYGWFyzsgZ1VISRIDf+HWm4R/TJXluhWMEkEtZuqi3qA==",
+      "dev": true,
       "requires": {
         "lodash.throttle": "^4.1.1",
-        "metro-resolver": "0.76.7"
+        "metro-resolver": "0.76.8"
       }
     },
     "metro-file-map": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-file-map/-/metro-file-map-0.76.7.tgz",
-      "integrity": "sha512-s+zEkTcJ4mOJTgEE2ht4jIo1DZfeWreQR3tpT3gDV/Y/0UQ8aJBTv62dE775z0GLsWZApiblAYZsj7ZE8P06nw==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-file-map/-/metro-file-map-0.76.8.tgz",
+      "integrity": "sha512-A/xP1YNEVwO1SUV9/YYo6/Y1MmzhL4ZnVgcJC3VmHp/BYVOXVStzgVbWv2wILe56IIMkfXU+jpXrGKKYhFyHVw==",
+      "dev": true,
       "requires": {
         "anymatch": "^3.0.3",
         "debug": "^2.2.0",
@@ -73414,6 +74079,7 @@
           "version": "27.5.1",
           "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
           "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+          "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
             "@types/istanbul-reports": "^3.0.0",
@@ -73426,6 +74092,7 @@
           "version": "16.0.5",
           "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.5.tgz",
           "integrity": "sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==",
+          "dev": true,
           "requires": {
             "@types/yargs-parser": "*"
           }
@@ -73434,6 +74101,7 @@
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
           "requires": {
             "color-convert": "^2.0.1"
           }
@@ -73442,6 +74110,7 @@
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
           "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
             "supports-color": "^7.1.0"
@@ -73451,6 +74120,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
           "requires": {
             "color-name": "~1.1.4"
           }
@@ -73458,12 +74128,14 @@
         "color-name": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
         },
         "debug": {
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
@@ -73471,17 +74143,20 @@
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
         },
         "jest-regex-util": {
           "version": "27.5.1",
           "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
-          "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg=="
+          "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
+          "dev": true
         },
         "jest-util": {
           "version": "27.5.1",
           "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
           "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+          "dev": true,
           "requires": {
             "@jest/types": "^27.5.1",
             "@types/node": "*",
@@ -73495,6 +74170,7 @@
           "version": "27.5.1",
           "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
           "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+          "dev": true,
           "requires": {
             "@types/node": "*",
             "merge-stream": "^2.0.0",
@@ -73505,6 +74181,7 @@
               "version": "8.1.1",
               "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
               "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+              "dev": true,
               "requires": {
                 "has-flag": "^4.0.0"
               }
@@ -73514,12 +74191,14 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
@@ -73527,9 +74206,10 @@
       }
     },
     "metro-inspector-proxy": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-inspector-proxy/-/metro-inspector-proxy-0.76.7.tgz",
-      "integrity": "sha512-rNZ/6edTl/1qUekAhAbaFjczMphM50/UjtxiKulo6vqvgn/Mjd9hVqDvVYfAMZXqPvlusD88n38UjVYPkruLSg==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-inspector-proxy/-/metro-inspector-proxy-0.76.8.tgz",
+      "integrity": "sha512-Us5o5UEd4Smgn1+TfHX4LvVPoWVo9VsVMn4Ldbk0g5CQx3Gu0ygc/ei2AKPGTwsOZmKxJeACj7yMH2kgxQP/iw==",
+      "dev": true,
       "requires": {
         "connect": "^3.6.5",
         "debug": "^2.2.0",
@@ -73542,6 +74222,7 @@
           "version": "8.0.1",
           "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
           "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+          "dev": true,
           "requires": {
             "string-width": "^4.2.0",
             "strip-ansi": "^6.0.1",
@@ -73552,6 +74233,7 @@
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
@@ -73559,23 +74241,27 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
         },
         "ws": {
           "version": "7.5.9",
           "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
           "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+          "dev": true,
           "requires": {}
         },
         "y18n": {
           "version": "5.0.8",
           "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
+          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+          "dev": true
         },
         "yargs": {
           "version": "17.7.2",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
           "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+          "dev": true,
           "requires": {
             "cliui": "^8.0.1",
             "escalade": "^3.1.1",
@@ -73589,30 +74275,34 @@
         "yargs-parser": {
           "version": "21.1.1",
           "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-          "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
+          "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+          "dev": true
         }
       }
     },
     "metro-minify-terser": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-minify-terser/-/metro-minify-terser-0.76.7.tgz",
-      "integrity": "sha512-FQiZGhIxCzhDwK4LxyPMLlq0Tsmla10X7BfNGlYFK0A5IsaVKNJbETyTzhpIwc+YFRT4GkFFwgo0V2N5vxO5HA==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-minify-terser/-/metro-minify-terser-0.76.8.tgz",
+      "integrity": "sha512-Orbvg18qXHCrSj1KbaeSDVYRy/gkro2PC7Fy2tDSH1c9RB4aH8tuMOIXnKJE+1SXxBtjWmQ5Yirwkth2DyyEZA==",
+      "dev": true,
       "requires": {
         "terser": "^5.15.0"
       }
     },
     "metro-minify-uglify": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-minify-uglify/-/metro-minify-uglify-0.76.7.tgz",
-      "integrity": "sha512-FuXIU3j2uNcSvQtPrAJjYWHruPiQ+EpE++J9Z+VznQKEHcIxMMoQZAfIF2IpZSrZYfLOjVFyGMvj41jQMxV1Vw==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-minify-uglify/-/metro-minify-uglify-0.76.8.tgz",
+      "integrity": "sha512-6l8/bEvtVaTSuhG1FqS0+Mc8lZ3Bl4RI8SeRIifVLC21eeSDp4CEBUWSGjpFyUDfi6R5dXzYaFnSgMNyfxADiQ==",
+      "dev": true,
       "requires": {
         "uglify-es": "^3.1.9"
       }
     },
     "metro-react-native-babel-preset": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.76.7.tgz",
-      "integrity": "sha512-R25wq+VOSorAK3hc07NW0SmN8z9S/IR0Us0oGAsBcMZnsgkbOxu77Mduqf+f4is/wnWHc5+9bfiqdLnaMngiVw==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.76.8.tgz",
+      "integrity": "sha512-Ptza08GgqzxEdK8apYsjTx2S8WDUlS2ilBlu9DR1CUcHmg4g3kOkFylZroogVAUKtpYQNYwAvdsjmrSdDNtiAg==",
+      "dev": true,
       "requires": {
         "@babel/core": "^7.20.0",
         "@babel/plugin-proposal-async-generator-functions": "^7.0.0",
@@ -73656,31 +74346,34 @@
       },
       "dependencies": {
         "react-refresh": {
-          "version": "0.4.3"
+          "version": "0.4.3",
+          "dev": true
         }
       }
     },
     "metro-react-native-babel-transformer": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.76.7.tgz",
-      "integrity": "sha512-W6lW3J7y/05ph3c2p3KKJNhH0IdyxdOCbQ5it7aM2MAl0SM4wgKjaV6EYv9b3rHklpV6K3qMH37UKVcjMooWiA==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.76.8.tgz",
+      "integrity": "sha512-3h+LfS1WG1PAzhq8QF0kfXjxuXetbY/lgz8vYMQhgrMMp17WM1DNJD0gjx8tOGYbpbBC1qesJ45KMS4o5TA73A==",
+      "dev": true,
       "requires": {
         "@babel/core": "^7.20.0",
         "babel-preset-fbjs": "^3.4.0",
         "hermes-parser": "0.12.0",
-        "metro-react-native-babel-preset": "0.76.7",
+        "metro-react-native-babel-preset": "0.76.8",
         "nullthrows": "^1.1.1"
       }
     },
     "metro-resolver": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-resolver/-/metro-resolver-0.76.7.tgz",
-      "integrity": "sha512-pC0Wgq29HHIHrwz23xxiNgylhI8Rq1V01kQaJ9Kz11zWrIdlrH0ZdnJ7GC6qA0ErROG+cXmJ0rJb8/SW1Zp2IA=="
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-resolver/-/metro-resolver-0.76.8.tgz",
+      "integrity": "sha512-KccOqc10vrzS7ZhG2NSnL2dh3uVydarB7nOhjreQ7C4zyWuiW9XpLC4h47KtGQv3Rnv/NDLJYeDqaJ4/+140HQ==",
+      "dev": true
     },
     "metro-runtime": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-runtime/-/metro-runtime-0.76.7.tgz",
-      "integrity": "sha512-MuWHubQHymUWBpZLwuKZQgA/qbb35WnDAKPo83rk7JRLIFPvzXSvFaC18voPuzJBt1V98lKQIonh6MiC9gd8Ug==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-runtime/-/metro-runtime-0.76.8.tgz",
+      "integrity": "sha512-XKahvB+iuYJSCr3QqCpROli4B4zASAYpkK+j3a0CJmokxCDNbgyI4Fp88uIL6rNaZfN0Mv35S0b99SdFXIfHjg==",
       "requires": {
         "@babel/runtime": "^7.0.0",
         "react-refresh": "^0.4.0"
@@ -73694,16 +74387,16 @@
       }
     },
     "metro-source-map": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.76.7.tgz",
-      "integrity": "sha512-Prhx7PeRV1LuogT0Kn5VjCuFu9fVD68eefntdWabrksmNY6mXK8pRqzvNJOhTojh6nek+RxBzZeD6MIOOyXS6w==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.76.8.tgz",
+      "integrity": "sha512-Hh0ncPsHPVf6wXQSqJqB3K9Zbudht4aUtNpNXYXSxH+pteWqGAXnjtPsRAnCsCWl38wL0jYF0rJDdMajUI3BDw==",
       "requires": {
         "@babel/traverse": "^7.20.0",
         "@babel/types": "^7.20.0",
         "invariant": "^2.2.4",
-        "metro-symbolicate": "0.76.7",
+        "metro-symbolicate": "0.76.8",
         "nullthrows": "^1.1.1",
-        "ob1": "0.76.7",
+        "ob1": "0.76.8",
         "source-map": "^0.5.6",
         "vlq": "^1.0.0"
       },
@@ -73716,12 +74409,12 @@
       }
     },
     "metro-symbolicate": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.76.7.tgz",
-      "integrity": "sha512-p0zWEME5qLSL1bJb93iq+zt5fz3sfVn9xFYzca1TJIpY5MommEaS64Va87lp56O0sfEIvh4307Oaf/ZzRjuLiQ==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.76.8.tgz",
+      "integrity": "sha512-LrRL3uy2VkzrIXVlxoPtqb40J6Bf1mlPNmUQewipc3qfKKFgtPHBackqDy1YL0njDsWopCKcfGtFYLn0PTUn3w==",
       "requires": {
         "invariant": "^2.2.4",
-        "metro-source-map": "0.76.7",
+        "metro-source-map": "0.76.8",
         "nullthrows": "^1.1.1",
         "source-map": "^0.5.6",
         "through2": "^2.0.1",
@@ -73736,9 +74429,10 @@
       }
     },
     "metro-transform-plugins": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-transform-plugins/-/metro-transform-plugins-0.76.7.tgz",
-      "integrity": "sha512-iSmnjVApbdivjuzb88Orb0JHvcEt5veVyFAzxiS5h0QB+zV79w6JCSqZlHCrbNOkOKBED//LqtKbFVakxllnNg==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-transform-plugins/-/metro-transform-plugins-0.76.8.tgz",
+      "integrity": "sha512-PlkGTQNqS51Bx4vuufSQCdSn2R2rt7korzngo+b5GCkeX5pjinPjnO2kNhQ8l+5bO0iUD/WZ9nsM2PGGKIkWFA==",
+      "dev": true,
       "requires": {
         "@babel/core": "^7.20.0",
         "@babel/generator": "^7.20.0",
@@ -73748,21 +74442,22 @@
       }
     },
     "metro-transform-worker": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/metro-transform-worker/-/metro-transform-worker-0.76.7.tgz",
-      "integrity": "sha512-cGvELqFMVk9XTC15CMVzrCzcO6sO1lURfcbgjuuPdzaWuD11eEyocvkTX0DPiRjsvgAmicz4XYxVzgYl3MykDw==",
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/metro-transform-worker/-/metro-transform-worker-0.76.8.tgz",
+      "integrity": "sha512-mE1fxVAnJKmwwJyDtThildxxos9+DGs9+vTrx2ktSFMEVTtXS/bIv2W6hux1pqivqAfyJpTeACXHk5u2DgGvIQ==",
+      "dev": true,
       "requires": {
         "@babel/core": "^7.20.0",
         "@babel/generator": "^7.20.0",
         "@babel/parser": "^7.20.0",
         "@babel/types": "^7.20.0",
         "babel-preset-fbjs": "^3.4.0",
-        "metro": "0.76.7",
-        "metro-babel-transformer": "0.76.7",
-        "metro-cache": "0.76.7",
-        "metro-cache-key": "0.76.7",
-        "metro-source-map": "0.76.7",
-        "metro-transform-plugins": "0.76.7",
+        "metro": "0.76.8",
+        "metro-babel-transformer": "0.76.8",
+        "metro-cache": "0.76.8",
+        "metro-cache-key": "0.76.8",
+        "metro-source-map": "0.76.8",
+        "metro-transform-plugins": "0.76.8",
         "nullthrows": "^1.1.1"
       }
     },
@@ -74403,26 +75098,6 @@
         "minipass": "^3.0.0"
       }
     },
-    "minipass-fetch": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.3.tgz",
-      "integrity": "sha512-n5ITsTkDqYkYJZjcRWzZt9qnZKCT7nKCosJhHoj7S7zD+BP4jVbWs+odsniw5TA3E0sLomhTKOKjF86wf11PuQ==",
-      "dev": true,
-      "requires": {
-        "encoding": "^0.1.13",
-        "minipass": "^5.0.0",
-        "minipass-sized": "^1.0.3",
-        "minizlib": "^2.1.2"
-      },
-      "dependencies": {
-        "minipass": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-          "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-          "dev": true
-        }
-      }
-    },
     "minipass-flush": {
       "version": "1.0.5",
       "dev": true,
@@ -74437,15 +75112,6 @@
         "minipass": "^3.0.0"
       }
     },
-    "minipass-sized": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
-      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
     "minizlib": {
       "version": "2.1.2",
       "dev": true,
@@ -74645,13 +75311,16 @@
       "resolved": "https://registry.npmjs.org/nocache/-/nocache-3.0.4.tgz",
       "integrity": "sha512-WDD0bdg9mbq6F4mRxEYcPWwfA1vxd0mrvKOyxI7Xj/atfRHVeutzuWByG//jfm4uPzp0y4Kj051EORCBSQMycw=="
     },
-    "node-abi": {
-      "version": "3.45.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.45.0.tgz",
-      "integrity": "sha512-iwXuFrMAcFVi/ZoZiqq8BzAdsLw9kxDfTC0HMyjXfSL/6CSDAGD5UmR7azrAgWV1zKYq7dUUMj4owusBWKLsiQ==",
+    "nock": {
+      "version": "13.3.3",
+      "resolved": "https://registry.npmjs.org/nock/-/nock-13.3.3.tgz",
+      "integrity": "sha512-z+KUlILy9SK/RjpeXDiDUEAq4T94ADPHE3qaRkf66mpEhzc/ytOMm3Bwdrbq6k1tMWkbdujiKim3G2tfQARuJw==",
       "dev": true,
       "requires": {
-        "semver": "^7.3.5"
+        "debug": "^4.1.0",
+        "json-stringify-safe": "^5.0.1",
+        "lodash": "^4.17.21",
+        "propagate": "^2.0.0"
       }
     },
     "node-abort-controller": {
@@ -74666,15 +75335,6 @@
       "dev": true,
       "optional": true
     },
-    "node-api-version": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.1.4.tgz",
-      "integrity": "sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g==",
-      "dev": true,
-      "requires": {
-        "semver": "^7.3.5"
-      }
-    },
     "node-dir": {
       "version": "0.1.17",
       "requires": {
@@ -74706,76 +75366,6 @@
       "version": "1.3.1",
       "dev": true
     },
-    "node-gyp": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.0.tgz",
-      "integrity": "sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==",
-      "dev": true,
-      "requires": {
-        "env-paths": "^2.2.0",
-        "exponential-backoff": "^3.1.1",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.2.6",
-        "make-fetch-happen": "^11.0.3",
-        "nopt": "^6.0.0",
-        "npmlog": "^6.0.0",
-        "rimraf": "^3.0.2",
-        "semver": "^7.3.5",
-        "tar": "^6.1.2",
-        "which": "^2.0.2"
-      },
-      "dependencies": {
-        "are-we-there-yet": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
-          "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
-          "dev": true,
-          "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^3.6.0"
-          }
-        },
-        "gauge": {
-          "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
-          "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
-          "dev": true,
-          "requires": {
-            "aproba": "^1.0.3 || ^2.0.0",
-            "color-support": "^1.1.3",
-            "console-control-strings": "^1.1.0",
-            "has-unicode": "^2.0.1",
-            "signal-exit": "^3.0.7",
-            "string-width": "^4.2.3",
-            "strip-ansi": "^6.0.1",
-            "wide-align": "^1.1.5"
-          }
-        },
-        "npmlog": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
-          "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
-          "dev": true,
-          "requires": {
-            "are-we-there-yet": "^3.0.0",
-            "console-control-strings": "^1.1.0",
-            "gauge": "^4.0.3",
-            "set-blocking": "^2.0.0"
-          }
-        },
-        "readable-stream": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
     "node-int64": {
       "version": "0.4.0"
     },
@@ -74833,15 +75423,6 @@
       "resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.15.0.tgz",
       "integrity": "sha512-LN4fydt9TqhZhThkZIVQnF9cwjU3qmUH9h78Mx/K7d3VvfRqqwthLwJEUOEL0QPZ0XQmNN7be5Ggit5+4dq3Bw=="
     },
-    "nopt": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
-      "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==",
-      "dev": true,
-      "requires": {
-        "abbrev": "^1.0.0"
-      }
-    },
     "normalize-css-color": {
       "version": "1.0.2"
     },
@@ -74875,6 +75456,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": {
@@ -74912,9 +75499,9 @@
       "dev": true
     },
     "ob1": {
-      "version": "0.76.7",
-      "resolved": "https://registry.npmjs.org/ob1/-/ob1-0.76.7.tgz",
-      "integrity": "sha512-BQdRtxxoUNfSoZxqeBGOyuT9nEYSn18xZHwGMb0mMVpn2NBcYbnyKY4BK2LIHRgw33CBGlUmE+KMaNvyTpLLtQ=="
+      "version": "0.76.8",
+      "resolved": "https://registry.npmjs.org/ob1/-/ob1-0.76.8.tgz",
+      "integrity": "sha512-dlBkJJV5M/msj9KYA9upc+nUWVwuOFFTbu28X6kZeGwcuW+JxaHSBZ70SYQnk5M+j5JbNLR6yKHmgW4M5E7X5g=="
     },
     "object-assign": {
       "version": "4.1.1"
@@ -75506,11 +76093,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=="
         }
       }
     },
@@ -75975,6 +76557,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,
@@ -76051,17 +76639,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": {
@@ -76348,6 +76930,14 @@
         "scheduler": "^0.22.0"
       }
     },
+    "react-error-boundary": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-4.0.11.tgz",
+      "integrity": "sha512-U13ul67aP5DOSPNSCWQ/eO0AQEYzEFkVljULQIjMV0KlffTAhxuDoBKdO0pb/JZ8mDhMKFZ9NZi0BmLGUiNphw==",
+      "requires": {
+        "@babel/runtime": "^7.12.5"
+      }
+    },
     "react-freeze": {
       "version": "1.0.3",
       "requires": {}
@@ -76372,20 +76962,20 @@
       }
     },
     "react-native": {
-      "version": "0.72.3",
-      "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.72.3.tgz",
-      "integrity": "sha512-QqISi+JVmCssNP2FlQ4MWhlc4O/I00MRE1/GClvyZ8h/6kdsyk/sOirkYdZqX3+DrJfI3q+OnyMnsyaXIQ/5tQ==",
+      "version": "0.72.4",
+      "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.72.4.tgz",
+      "integrity": "sha512-+vrObi0wZR+NeqL09KihAAdVlQ9IdplwznJWtYrjnQ4UbCW6rkzZJebRsugwUneSOKNFaHFEo1uKU89HsgtYBg==",
       "requires": {
         "@jest/create-cache-key-function": "^29.2.1",
-        "@react-native-community/cli": "11.3.5",
-        "@react-native-community/cli-platform-android": "11.3.5",
-        "@react-native-community/cli-platform-ios": "11.3.5",
+        "@react-native-community/cli": "11.3.6",
+        "@react-native-community/cli-platform-android": "11.3.6",
+        "@react-native-community/cli-platform-ios": "11.3.6",
         "@react-native/assets-registry": "^0.72.0",
         "@react-native/codegen": "^0.72.6",
         "@react-native/gradle-plugin": "^0.72.11",
         "@react-native/js-polyfills": "^0.72.1",
         "@react-native/normalize-colors": "^0.72.0",
-        "@react-native/virtualized-lists": "^0.72.6",
+        "@react-native/virtualized-lists": "^0.72.8",
         "abort-controller": "^3.0.0",
         "anser": "^1.4.9",
         "base64-js": "^1.1.2",
@@ -76396,8 +76986,8 @@
         "jest-environment-node": "^29.2.1",
         "jsc-android": "^250231.0.0",
         "memoize-one": "^5.0.0",
-        "metro-runtime": "0.76.7",
-        "metro-source-map": "0.76.7",
+        "metro-runtime": "0.76.8",
+        "metro-source-map": "0.76.8",
         "mkdirp": "^0.5.1",
         "nullthrows": "^1.1.1",
         "pretty-format": "^26.5.2",
@@ -76623,9 +77213,9 @@
       }
     },
     "react-native-google-places-autocomplete": {
-      "version": "git+ssh://git@github.com/Expensify/react-native-google-places-autocomplete.git#ee87343c3e827ff7818abc71b6bb04fcc1f120e0",
-      "integrity": "sha512-OJWCz4Epj1p8tyNImWNykAqpd/X1MkNCFPY0dSbgiTJGbW4J5T4bC0PIUQ+ExjxWpWjcFaielTLdoSz0HfeIpw==",
-      "from": "react-native-google-places-autocomplete@git+https://github.com/Expensify/react-native-google-places-autocomplete.git#ee87343c3e827ff7818abc71b6bb04fcc1f120e0",
+      "version": "git+ssh://git@github.com/Expensify/react-native-google-places-autocomplete.git#cef3ac29d9501091453136e1219e24c4ec9f9d76",
+      "integrity": "sha512-2z3ED8jOXasPTzBqvPwpG10LQsBArTRsYszmoz+TfqbgZrSBmP3c8rhaC//lx6Pvfs2r+KYWqJUrLf4mbCrjZw==",
+      "from": "react-native-google-places-autocomplete@git+https://github.com/Expensify/react-native-google-places-autocomplete.git#cef3ac29d9501091453136e1219e24c4ec9f9d76",
       "requires": {
         "lodash.debounce": "^4.0.8",
         "prop-types": "^15.7.2",
@@ -76679,9 +77269,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.97",
+      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.97.tgz",
+      "integrity": "sha512-6w4pp9Ktm4lQ6jIS+ZASQ5tYwRU1lt751yxfddvmN646XZefj4iDvC7uQaUnAgg1xL52dEV5RZWaI3sQ3e9AGQ==",
       "requires": {
         "ascii-table": "0.0.9",
         "fast-equals": "^4.0.3",
@@ -76704,7 +77294,9 @@
       }
     },
     "react-native-performance": {
-      "version": "4.0.0",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/react-native-performance/-/react-native-performance-5.1.0.tgz",
+      "integrity": "sha512-rq/YBf0/GptSOM/Lj64/1yRq8uN2YE0psFB16wFbYBbTcIEp/0rrgN2HyS5lhvfBOFgKoDRWQ53jHSCb+QJ5eA==",
       "requires": {}
     },
     "react-native-performance-flipper-reporter": {
@@ -76740,9 +77332,9 @@
       "requires": {}
     },
     "react-native-reanimated": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.4.0.tgz",
-      "integrity": "sha512-B5cZJseoIkYlZTRBRN0xuU1NBxUza/6GSHhiEBQfbOufWVlUMMcWUecIRVglW49l8d2wXbfCdQlNyVoFqmHkaQ==",
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.5.4.tgz",
+      "integrity": "sha512-8we9LLDO1o4Oj9/DICeEJ2K1tjfqkJagqQUglxeUAkol/HcEJ6PGxIrpBcNryLqCDYEcu6FZWld/FzizBIw6bg==",
       "requires": {
         "@babel/plugin-transform-object-assign": "^7.16.7",
         "@babel/preset-typescript": "^7.16.7",
@@ -76751,7 +77343,9 @@
       },
       "dependencies": {
         "convert-source-map": {
-          "version": "2.0.0"
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+          "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
         }
       }
     },
@@ -76801,7 +77395,9 @@
       }
     },
     "react-native-svg": {
-      "version": "13.9.0",
+      "version": "13.13.0",
+      "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-13.13.0.tgz",
+      "integrity": "sha512-L8y8uEiMG0Tr++Nb2+24wlMuv18+bmq/CMoFFtTUlEqVvGCoK2ea8WamPl/9bV8gjL+Rngg5NqEBvKS23sbYoA==",
       "requires": {
         "css-select": "^5.1.0",
         "css-tree": "^1.1.3"
@@ -77265,6 +77861,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",
@@ -78547,20 +79149,12 @@
       }
     },
     "simple-update-notifier": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
-      "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz",
+      "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==",
       "dev": true,
       "requires": {
-        "semver": "~7.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
-          "dev": true
-        }
+        "semver": "^7.5.3"
       }
     },
     "simply-deferred": {
@@ -78628,7 +79222,8 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
       "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "snapdragon": {
       "version": "0.8.2",
@@ -78791,27 +79386,6 @@
         "websocket-driver": "^0.7.4"
       }
     },
-    "socks": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
-      "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
-      "dev": true,
-      "requires": {
-        "ip": "^2.0.0",
-        "smart-buffer": "^4.2.0"
-      }
-    },
-    "socks-proxy-agent": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz",
-      "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==",
-      "dev": true,
-      "requires": {
-        "agent-base": "^6.0.2",
-        "debug": "^4.3.3",
-        "socks": "^2.6.2"
-      }
-    },
     "sort-asc": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/sort-asc/-/sort-asc-0.2.0.tgz",
@@ -79659,7 +80233,9 @@
       "dev": true
     },
     "throat": {
-      "version": "5.0.0"
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
+      "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA=="
     },
     "throttle-debounce": {
       "version": "3.0.1",
@@ -80563,7 +81139,9 @@
       "version": "1.2.8"
     },
     "vlq": {
-      "version": "1.0.1"
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/vlq/-/vlq-1.0.1.tgz",
+      "integrity": "sha512-gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w=="
     },
     "vm-browserify": {
       "version": "1.1.2"
@@ -81623,8 +82201,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 6666fd19cf7a..b7acd8bd7b55 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.67-2",
+  "version": "1.3.75-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,14 @@
     "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",
+    "gh-actions-unused-styles": "./.github/scripts/findUnusedKeys.sh",
+    "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",
@@ -58,6 +62,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",
@@ -76,6 +82,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",
@@ -86,7 +93,7 @@
     "date-fns-tz": "^2.0.0",
     "dom-serializer": "^0.2.2",
     "domhandler": "^4.3.0",
-    "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#e63d06e239fe5b2f221e86eab71ae8a4e3b8bee3",
+    "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#1609f1848cc0c2528064519c3ea48b4953a708ee",
     "fbjs": "^3.0.2",
     "htmlparser2": "^7.2.0",
     "idb-keyval": "^6.2.1",
@@ -100,13 +107,14 @@
     "patch-package": "^8.0.0",
     "process": "^0.11.10",
     "prop-types": "^15.7.2",
-    "pusher-js": "7.4.0",
+    "pusher-js": "8.3.0",
     "react": "18.2.0",
     "react-collapse": "^5.1.0",
     "react-content-loader": "^6.1.0",
     "react-dom": "18.1.0",
     "react-map-gl": "^7.1.3",
-    "react-native": "0.72.3",
+    "react-error-boundary": "^4.0.11",
+    "react-native": "0.72.4",
     "react-native-blob-util": "^0.17.3",
     "react-native-collapsible": "^1.6.0",
     "react-native-config": "^1.4.5",
@@ -116,7 +124,7 @@
     "react-native-fast-image": "^8.6.3",
     "react-native-fs": "^2.20.0",
     "react-native-gesture-handler": "2.12.0",
-    "react-native-google-places-autocomplete": "git+https://github.com/Expensify/react-native-google-places-autocomplete.git#ee87343c3e827ff7818abc71b6bb04fcc1f120e0",
+    "react-native-google-places-autocomplete": "git+https://github.com/Expensify/react-native-google-places-autocomplete.git#cef3ac29d9501091453136e1219e24c4ec9f9d76",
     "react-native-haptic-feedback": "^1.13.0",
     "react-native-image-pan-zoom": "^2.1.12",
     "react-native-image-picker": "^5.1.0",
@@ -125,20 +133,20 @@
     "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.97",
     "react-native-pager-view": "^6.2.0",
     "react-native-pdf": "^6.7.1",
-    "react-native-performance": "^4.0.0",
+    "react-native-performance": "^5.1.0",
     "react-native-permissions": "^3.0.1",
     "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#eae05855286dc699954415cc1d629bfd8e8e47e2",
     "react-native-plaid-link-sdk": "^10.0.0",
     "react-native-qrcode-svg": "^6.2.0",
     "react-native-quick-sqlite": "^8.0.0-beta.2",
-    "react-native-reanimated": "3.4.0",
+    "react-native-reanimated": "3.5.4",
     "react-native-render-html": "6.3.1",
     "react-native-safe-area-context": "4.4.1",
     "react-native-screens": "3.21.0",
-    "react-native-svg": "^13.9.0",
+    "react-native-svg": "^13.13.0",
     "react-native-tab-view": "^3.5.2",
     "react-native-url-polyfill": "^2.0.0",
     "react-native-view-shot": "^3.6.0",
@@ -168,11 +176,13 @@
     "@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",
     "@react-native-community/eslint-config": "3.0.0",
-    "@react-native/metro-config": "^0.72.9",
+    "@react-native/metro-config": "^0.72.11",
     "@react-navigation/devtools": "^6.0.10",
     "@storybook/addon-a11y": "^6.5.9",
     "@storybook/addon-essentials": "^7.0.0",
@@ -219,11 +229,11 @@
     "css-loader": "^6.7.2",
     "diff-so-fancy": "^1.3.0",
     "dotenv": "^16.0.3",
-    "electron": "^25.8.0",
-    "electron-builder": "24.5.0",
+    "electron": "^25.8.1",
+    "electron-builder": "24.6.4",
     "eslint": "^7.6.0",
     "eslint-config-airbnb-typescript": "^17.1.0",
-    "eslint-config-expensify": "^2.0.38",
+    "eslint-config-expensify": "^2.0.39",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-jest": "^24.1.0",
     "eslint-plugin-jsdoc": "^46.2.6",
@@ -237,7 +247,7 @@
     "jest-circus": "29.4.1",
     "jest-cli": "29.4.1",
     "jest-environment-jsdom": "^29.4.1",
-    "metro-react-native-babel-preset": "0.76.7",
+    "metro-react-native-babel-preset": "0.76.8",
     "mock-fs": "^4.13.0",
     "onchange": "^7.1.0",
     "portfinder": "^1.0.28",
@@ -261,7 +271,8 @@
     "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.9.3",
     "webpack-font-preload-plugin": "^1.5.0",
-    "webpack-merge": "^5.8.0"
+    "webpack-merge": "^5.8.0",
+    "yaml": "^2.2.1"
   },
   "overrides": {
     "react-native": "$react-native"
diff --git a/patches/react-native+0.72.3+001+initial.patch b/patches/react-native+0.72.4+001+initial.patch
similarity index 100%
rename from patches/react-native+0.72.3+001+initial.patch
rename to patches/react-native+0.72.4+001+initial.patch
diff --git a/patches/react-native+0.72.3+002+NumberOfLines.patch b/patches/react-native+0.72.4+002+NumberOfLines.patch
similarity index 97%
rename from patches/react-native+0.72.3+002+NumberOfLines.patch
rename to patches/react-native+0.72.4+002+NumberOfLines.patch
index 7d773297cb5f..75422f84708e 100644
--- a/patches/react-native+0.72.3+002+NumberOfLines.patch
+++ b/patches/react-native+0.72.4+002+NumberOfLines.patch
@@ -30,10 +30,10 @@ index 6f69329..d531bee 100644
      maxLength: true,
      autoCapitalize: true,
 diff --git a/node_modules/react-native/Libraries/Components/TextInput/TextInput.d.ts b/node_modules/react-native/Libraries/Components/TextInput/TextInput.d.ts
-index ff029fb..0835135 100644
+index 8badb2a..b19f197 100644
 --- a/node_modules/react-native/Libraries/Components/TextInput/TextInput.d.ts
 +++ b/node_modules/react-native/Libraries/Components/TextInput/TextInput.d.ts
-@@ -338,12 +338,6 @@ export interface TextInputAndroidProps {
+@@ -347,12 +347,6 @@ export interface TextInputAndroidProps {
     */
    inlineImagePadding?: number | undefined;
  
@@ -46,7 +46,7 @@ index ff029fb..0835135 100644
    /**
     * Sets the return key to the label. Use it instead of `returnKeyType`.
     * @platform android
-@@ -654,11 +648,29 @@ export interface TextInputProps
+@@ -663,11 +657,30 @@ export interface TextInputProps
     */
    maxLength?: number | undefined;
  
@@ -72,6 +72,7 @@ index ff029fb..0835135 100644
 +   * Use it with multiline set to true to be able to fill the lines.
 +   */
 +  rows?: number | undefined;
++
 +
    /**
     * Callback that is called when the text input is blurred
@@ -147,10 +148,10 @@ index 7ed4579..b1d994e 100644
     * If `true`, the text input obscures the text entered so that sensitive text
     * like passwords stay secure. The default value is `false`. Does not work with 'multiline={true}'.
 diff --git a/node_modules/react-native/Libraries/Components/TextInput/TextInput.js b/node_modules/react-native/Libraries/Components/TextInput/TextInput.js
-index df89097..3b223ec 100644
+index 2127191..542fc06 100644
 --- a/node_modules/react-native/Libraries/Components/TextInput/TextInput.js
 +++ b/node_modules/react-native/Libraries/Components/TextInput/TextInput.js
-@@ -387,7 +387,6 @@ type AndroidProps = $ReadOnly<{|
+@@ -390,7 +390,6 @@ type AndroidProps = $ReadOnly<{|
    /**
     * Sets the number of lines for a `TextInput`. Use it with multiline set to
     * `true` to be able to fill the lines.
@@ -158,7 +159,7 @@ index df89097..3b223ec 100644
     */
    numberOfLines?: ?number,
  
-@@ -400,10 +399,14 @@ type AndroidProps = $ReadOnly<{|
+@@ -403,10 +402,14 @@ type AndroidProps = $ReadOnly<{|
    /**
     * Sets the number of rows for a `TextInput`. Use it with multiline set to
     * `true` to be able to fill the lines.
@@ -174,7 +175,7 @@ index df89097..3b223ec 100644
    /**
     * When `false`, it will prevent the soft keyboard from showing when the field is focused.
     * Defaults to `true`.
-@@ -1066,6 +1069,9 @@ function InternalTextInput(props: Props): React.Node {
+@@ -1069,6 +1072,9 @@ function InternalTextInput(props: Props): React.Node {
      accessibilityState,
      id,
      tabIndex,
@@ -184,7 +185,7 @@ index df89097..3b223ec 100644
      selection: propsSelection,
      ...otherProps
    } = props;
-@@ -1422,6 +1428,8 @@ function InternalTextInput(props: Props): React.Node {
+@@ -1427,6 +1433,8 @@ function InternalTextInput(props: Props): React.Node {
          focusable={tabIndex !== undefined ? !tabIndex : focusable}
          mostRecentEventCount={mostRecentEventCount}
          nativeID={id ?? props.nativeID}
@@ -193,7 +194,7 @@ index df89097..3b223ec 100644
          onBlur={_onBlur}
          onKeyPressSync={props.unstable_onKeyPressSync}
          onChange={_onChange}
-@@ -1477,6 +1485,7 @@ function InternalTextInput(props: Props): React.Node {
+@@ -1482,6 +1490,7 @@ function InternalTextInput(props: Props): React.Node {
          mostRecentEventCount={mostRecentEventCount}
          nativeID={id ?? props.nativeID}
          numberOfLines={props.rows ?? props.numberOfLines}
@@ -549,7 +550,7 @@ index 190bc27..c2bcdc1 100644
              : mEllipsizeLocation;
      setEllipsize(ellipsizeLocation);
 diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
-index 561a2d0..017be13 100644
+index 561a2d0..9409cfc 100644
 --- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
 +++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
 @@ -18,6 +18,7 @@ import android.text.SpannableStringBuilder;
@@ -568,7 +569,7 @@ index 561a2d0..017be13 100644
    private static final LruCache<ReadableNativeMap, Spannable> sSpannableCache =
        new LruCache<>(spannableCacheSize);
    private static final ConcurrentHashMap<Integer, Spannable> sTagToSpannableCache =
-@@ -385,6 +387,47 @@ public class TextLayoutManager {
+@@ -385,6 +387,48 @@ public class TextLayoutManager {
              ? paragraphAttributes.getInt(MAXIMUM_NUMBER_OF_LINES_KEY)
              : UNSET;
  
@@ -612,12 +613,13 @@ index 561a2d0..017be13 100644
 +    if (numberOfLines != UNSET && numberOfLines != 0) {
 +      maximumNumberOfLines = numberOfLines;
 +    }
++
 +
      int calculatedLineCount =
          maximumNumberOfLines == UNSET || maximumNumberOfLines == 0
              ? layout.getLineCount()
 diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
-index 0d118f0..f29f069 100644
+index 0d118f0..0ae44b7 100644
 --- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
 +++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManagerMapBuffer.java
 @@ -18,6 +18,7 @@ import android.text.SpannableStringBuilder;
@@ -636,7 +638,7 @@ index 0d118f0..f29f069 100644
  
    private static final boolean ENABLE_MEASURE_LOGGING = ReactBuildConfig.DEBUG && false;
  
-@@ -399,6 +401,46 @@ public class TextLayoutManagerMapBuffer {
+@@ -399,6 +401,47 @@ public class TextLayoutManagerMapBuffer {
              ? paragraphAttributes.getInt(PA_KEY_MAX_NUMBER_OF_LINES)
              : UNSET;
  
@@ -679,15 +681,16 @@ index 0d118f0..f29f069 100644
 +    if (numberOfLines != UNSET && numberOfLines != 0) {
 +      maximumNumberOfLines = numberOfLines;
 +    }
++
 +
      int calculatedLineCount =
          maximumNumberOfLines == UNSET || maximumNumberOfLines == 0
              ? layout.getLineCount()
 diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
-index 1b5e0f4..67d0b73 100644
+index ced37be..ef2f321 100644
 --- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
 +++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
-@@ -483,7 +483,13 @@ public class ReactEditText extends AppCompatEditText
+@@ -548,7 +548,13 @@ public class ReactEditText extends AppCompatEditText
       * href='https://android.googlesource.com/platform/frameworks/base/+/jb-release/core/java/android/widget/TextView.java'>TextView.java</a>}
       */
      if (isMultiline()) {
@@ -807,10 +810,10 @@ index f5f87c6..b7d1e90 100644
          attributes.ellipsizeMode,
          attributes.textBreakStrategy,
 diff --git a/node_modules/react-native/ReactCommon/react/renderer/attributedstring/conversions.h b/node_modules/react-native/ReactCommon/react/renderer/attributedstring/conversions.h
-index 8687b89..26379f4 100644
+index 8687b89..eab75f4 100644
 --- a/node_modules/react-native/ReactCommon/react/renderer/attributedstring/conversions.h
 +++ b/node_modules/react-native/ReactCommon/react/renderer/attributedstring/conversions.h
-@@ -835,12 +835,18 @@ inline ParagraphAttributes convertRawProp(
+@@ -835,10 +835,16 @@ inline ParagraphAttributes convertRawProp(
      ParagraphAttributes const &defaultParagraphAttributes) {
    auto paragraphAttributes = ParagraphAttributes{};
  
@@ -819,19 +822,15 @@ index 8687b89..26379f4 100644
        context,
        rawProps,
        "numberOfLines",
--      sourceParagraphAttributes.maximumNumberOfLines,
--      defaultParagraphAttributes.maximumNumberOfLines);
 +      sourceParagraphAttributes.numberOfLines,
 +      defaultParagraphAttributes.numberOfLines);
 +  paragraphAttributes.maximumNumberOfLines = convertRawProp(
-+       context,
-+       rawProps,
-+       "maximumNumberOfLines",
-+       sourceParagraphAttributes.maximumNumberOfLines,
-+       defaultParagraphAttributes.maximumNumberOfLines);
++      context,
++      rawProps,
++      "maximumNumberOfLines",
+       sourceParagraphAttributes.maximumNumberOfLines,
+       defaultParagraphAttributes.maximumNumberOfLines);
    paragraphAttributes.ellipsizeMode = convertRawProp(
-       context,
-       rawProps,
 @@ -913,6 +919,7 @@ inline std::string toString(AttributedString::Range const &range) {
  inline folly::dynamic toDynamic(
      const ParagraphAttributes &paragraphAttributes) {
@@ -853,7 +852,7 @@ index 8687b89..26379f4 100644
        PA_KEY_HYPHENATION_FREQUENCY,
        toString(paragraphAttributes.android_hyphenationFrequency));
 +  builder.putInt(
-+       PA_KEY_NUMBER_OF_LINES, paragraphAttributes.numberOfLines);
++      PA_KEY_NUMBER_OF_LINES, paragraphAttributes.numberOfLines);
  
    return builder.build();
  }
@@ -914,15 +913,15 @@ index ba39ebb..ead28e3 100644
    std::string textBreakStrategy{};
    SharedColor underlineColorAndroid{};
 diff --git a/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm b/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm
-index 368c334..2a98ad0 100644
+index 368c334..a1bb33e 100644
 --- a/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm
 +++ b/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm
-@@ -244,26 +244,50 @@ - (void)getRectWithAttributedString:(AttributedString)attributedString
+@@ -244,26 +244,51 @@ - (void)getRectWithAttributedString:(AttributedString)attributedString
  
  #pragma mark - Private
  
 -- (NSTextStorage *)_textStorageForNSAttributesString:(NSAttributedString *)attributedString
-+- (NSTextStorage *)_textStorageForNSAttributesString:(NSAttributedString *)inputAttributedString
+++- (NSTextStorage *)_textStorageForNSAttributesString:(NSAttributedString *)inputAttributedString
                                   paragraphAttributes:(ParagraphAttributes)paragraphAttributes
                                                  size:(CGSize)size
  {
@@ -950,7 +949,6 @@ index 368c334..2a98ad0 100644
 -      ? RCTNSLineBreakModeFromEllipsizeMode(paragraphAttributes.ellipsizeMode)
 -      : NSLineBreakByClipping;
 -  textContainer.maximumNumberOfLines = paragraphAttributes.maximumNumberOfLines;
-+
 +    [attributedString insertAttributedString:[[NSAttributedString alloc] initWithString:newLines attributes:attributesOfFirstCharacter] atIndex:0];
 +  }
 +
@@ -959,7 +957,7 @@ index 368c334..2a98ad0 100644
    NSLayoutManager *layoutManager = [NSLayoutManager new];
    layoutManager.usesFontLeading = NO;
    [layoutManager addTextContainer:textContainer];
--
+ 
 -  NSTextStorage *textStorage = [[NSTextStorage alloc] initWithAttributedString:attributedString];
 +  NSTextStorage *textStorage = [NSTextStorage new];
  
@@ -973,6 +971,7 @@ index 368c334..2a98ad0 100644
 +  textContainer.maximumNumberOfLines = paragraphAttributes.maximumNumberOfLines;
 +
 +  [textStorage replaceCharactersInRange:(NSRange){0, textStorage.length} withAttributedString:attributedString];
++
 +
    if (paragraphAttributes.adjustsFontSizeToFit) {
      CGFloat minimumFontSize = !isnan(paragraphAttributes.minimumFontSize) ? paragraphAttributes.minimumFontSize : 4.0;
diff --git a/patches/react-native+0.72.3+003+VerticalScrollBarPosition.patch b/patches/react-native+0.72.4+003+VerticalScrollBarPosition.patch
similarity index 76%
rename from patches/react-native+0.72.3+003+VerticalScrollBarPosition.patch
rename to patches/react-native+0.72.4+003+VerticalScrollBarPosition.patch
index 1cf8f6de54fb..e6ed0d4f79a3 100644
--- a/patches/react-native+0.72.3+003+VerticalScrollBarPosition.patch
+++ b/patches/react-native+0.72.4+003+VerticalScrollBarPosition.patch
@@ -1,12 +1,11 @@
 diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
-index 46e0ccf..53293a4 100644
+index 33658e7..31c20c0 100644
 --- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
 +++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
-@@ -379,4 +379,15 @@ public class ReactScrollViewManager extends ViewGroupManager<ReactScrollView>
-   public void setScrollEventThrottle(ReactScrollView view, int scrollEventThrottle) {
+@@ -381,6 +381,17 @@ public class ReactScrollViewManager extends ViewGroupManager<ReactScrollView>
      view.setScrollEventThrottle(scrollEventThrottle);
    }
-+
+ 
 +  @ReactProp(name = "verticalScrollbarPosition")
 +  public void setVerticalScrollbarPosition(ReactScrollView view, String position) {
 +    if ("right".equals(position)) {
@@ -17,4 +16,7 @@ index 46e0ccf..53293a4 100644
 +      view.setVerticalScrollbarPosition(View.SCROLLBAR_POSITION_DEFAULT);
 +    }
 +  }
- }
++
+   @ReactProp(name = "isInvertedVirtualizedList")
+   public void setIsInvertedVirtualizedList(ReactScrollView view, boolean applyFix) {
+     // Usually when inverting the scroll view we are using scaleY: -1 on the list
diff --git a/patches/react-native+0.72.3+004+ModalKeyboardFlashing.patch b/patches/react-native+0.72.4+004+ModalKeyboardFlashing.patch
similarity index 100%
rename from patches/react-native+0.72.3+004+ModalKeyboardFlashing.patch
rename to patches/react-native+0.72.4+004+ModalKeyboardFlashing.patch
diff --git a/patches/react-native-image-picker+5.1.0.patch b/patches/react-native-image-picker+5.1.0.patch
new file mode 100644
index 000000000000..0defc430e669
--- /dev/null
+++ b/patches/react-native-image-picker+5.1.0.patch
@@ -0,0 +1,133 @@
+diff --git a/node_modules/react-native-image-picker/android/src/main/java/com/imagepicker/ImagePickerModuleImpl.java b/node_modules/react-native-image-picker/android/src/main/java/com/imagepicker/ImagePickerModuleImpl.java
+index 89b69a8..d86ab1e 100644
+--- a/node_modules/react-native-image-picker/android/src/main/java/com/imagepicker/ImagePickerModuleImpl.java
++++ b/node_modules/react-native-image-picker/android/src/main/java/com/imagepicker/ImagePickerModuleImpl.java
+@@ -29,6 +29,120 @@ public class ImagePickerModuleImpl implements ActivityEventListener {
+     public static final int REQUEST_LAUNCH_VIDEO_CAPTURE = 13002;
+     public static final int REQUEST_LAUNCH_LIBRARY = 13003;
+
++    // Prevent svg images from being selected as they are not supported (Image component does not support them)
++    // and also because iOS does not allow them to be selected (for consistency).
++    // Since, we can't exclude a mime type, we instead allow all image mime types except 'image/svg+xml'.
++    // Image mime types are generated by merging the Android image mime type support and the IANA media-types lists.
++    //   https://android.googlesource.com/platform/external/mime-support/+/main/mime.types#636
++    //   https://www.iana.org/assignments/media-types/media-types.xhtml#image
++    private static final String[] ALLOWED_IMAGE_MIME_TYPES = {
++        "image/aces",
++        "image/apng",
++        "image/avci",
++        "image/avcs",
++        "image/avif",
++        "image/bmp",
++        "image/cgm",
++        "image/dicom-rle",
++        "image/dpx",
++        "image/emf",
++        "image/example",
++        "image/fits",
++        "image/g3fax",
++        "image/gif",
++        "image/heic-sequence",
++        "image/heic",
++        "image/heif-sequence",
++        "image/heif",
++        "image/hej2k",
++        "image/hsj2",
++        "image/ief",
++        "image/j2c",
++        "image/jls",
++        "image/jp2",
++        "image/jpeg",
++        "image/jph",
++        "image/jphc",
++        "image/jpm",
++        "image/jpx",
++        "image/jxr",
++        "image/jxrA",
++        "image/jxrS",
++        "image/jxs",
++        "image/jxsc",
++        "image/jxsi",
++        "image/jxss",
++        "image/ktx",
++        "image/ktx2",
++        "image/naplps",
++        "image/pcx",
++        "image/png",
++        "image/prs.btif",
++        "image/prs.pti",
++        "image/pwg-raster",
++        // "image/svg+xml",
++        "image/t38",
++        "image/tiff-fx",
++        "image/tiff",
++        "image/vnd.adobe.photoshop",
++        "image/vnd.airzip.accelerator.azv",
++        "image/vnd.cns.inf2",
++        "image/vnd.dece.graphic",
++        "image/vnd.djvu",
++        "image/vnd.dvb.subtitle",
++        "image/vnd.dwg",
++        "image/vnd.dxf",
++        "image/vnd.fastbidsheet",
++        "image/vnd.fpx",
++        "image/vnd.fst",
++        "image/vnd.fujixerox.edmics-mmr",
++        "image/vnd.fujixerox.edmics-rlc",
++        "image/vnd.globalgraphics.pgb",
++        "image/vnd.microsoft.icon",
++        "image/vnd.mix",
++        "image/vnd.mozilla.apng",
++        "image/vnd.ms-modi",
++        "image/vnd.net-fpx",
++        "image/vnd.pco.b16",
++        "image/vnd.radiance",
++        "image/vnd.sealed.png",
++        "image/vnd.sealedmedia.softseal.gif",
++        "image/vnd.sealedmedia.softseal.jpg",
++        "image/vnd.svf",
++        "image/vnd.tencent.tap",
++        "image/vnd.valve.source.texture",
++        "image/vnd.wap.wbmp",
++        "image/vnd.xiff",
++        "image/vnd.zbrush.pcx",
++        "image/webp",
++        "image/wmf",
++        "image/x-canon-cr2",
++        "image/x-canon-crw",
++        "image/x-cmu-raster",
++        "image/x-coreldraw",
++        "image/x-coreldrawpattern",
++        "image/x-coreldrawtemplate",
++        "image/x-corelphotopaint",
++        "image/x-emf",
++        "image/x-epson-erf",
++        "image/x-icon",
++        "image/x-jg",
++        "image/x-jng",
++        "image/x-ms-bmp",
++        "image/x-nikon-nef",
++        "image/x-olympus-orf",
++        "image/x-photoshop",
++        "image/x-portable-anymap",
++        "image/x-portable-bitmap",
++        "image/x-portable-graymap",
++        "image/x-portable-pixmap",
++        "image/x-rgb",
++        "image/x-wmf",
++        "image/x-xbitmap",
++        "image/x-xpixmap",
++        "image/x-xwindowdump",
++    };
++
+     private Uri fileUri;
+
+     private ReactApplicationContext reactContext;
+@@ -148,6 +262,7 @@ public class ImagePickerModuleImpl implements ActivityEventListener {
+
+         if (isPhoto) {
+             libraryIntent.setType("image/*");
++            libraryIntent.putExtra(Intent.EXTRA_MIME_TYPES, this.ALLOWED_IMAGE_MIME_TYPES);
+         } else if (isVideo) {
+             libraryIntent.setType("video/*");
+         } else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
diff --git a/scripts/android-repackage-app-bundle-and-sign.sh b/scripts/android-repackage-app-bundle-and-sign.sh
index fe4ee1e4b8fc..1636edc21388 100755
--- a/scripts/android-repackage-app-bundle-and-sign.sh
+++ b/scripts/android-repackage-app-bundle-and-sign.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+source ./scripts/shellUtils.sh
 
 ###
 # Takes an android app that has been built with the debug keystore,
@@ -41,7 +42,7 @@ if [ ! -f "$NEW_BUNDLE_FILE" ]; then
     echo "Bundle file not found: $NEW_BUNDLE_FILE"
     exit 1
 fi
-OUTPUT_APK=$(realpath "$OUTPUT_APK")
+OUTPUT_APK=$(get_abs_path "$OUTPUT_APK")
 # check if "apktool" command is available
 if ! command -v apktool &> /dev/null
 then
diff --git a/scripts/shellUtils.sh b/scripts/shellUtils.sh
index 876933af9766..4c9e2febc34d 100644
--- a/scripts/shellUtils.sh
+++ b/scripts/shellUtils.sh
@@ -41,3 +41,46 @@ function join_by_string {
   shift
   printf "%s" "$first" "${@/#/$separator}"
 }
+
+# Usage: get_abs_path <path>
+# Will make a path absolute, resolving any relative paths
+# example: get_abs_path "./foo/bar"
+get_abs_path() {
+    local the_path=$1
+    local -a path_elements
+    IFS='/' read -ra path_elements <<< "$the_path"
+
+    # If the path is already absolute, start with an empty string.
+    # We'll prepend the / later when reconstructing the path.
+    if [[ "$the_path" = /* ]]; then
+        abs_path=""
+    else
+        abs_path="$(pwd)"
+    fi
+
+    # Handle each path element
+    for element in "${path_elements[@]}"; do
+        if [ "$element" = "." ] || [ -z "$element" ]; then
+            continue
+        elif [ "$element" = ".." ]; then
+            # Remove the last element from abs_path
+            abs_path=$(dirname "$abs_path")
+        else
+            # Append element to the absolute path
+            abs_path="${abs_path}/${element}"
+        fi
+    done
+
+    # Remove any trailing '/'
+    while [[ $abs_path == */ ]]; do
+        abs_path=${abs_path%/}
+    done
+
+    # Special case for root
+    [ -z "$abs_path" ] && abs_path="/"
+
+    # Special case to remove any starting '//' when the input path was absolute
+    abs_path=${abs_path/#\/\//\/}
+
+    echo "$abs_path"
+}
\ No newline at end of file
diff --git a/src/App.js b/src/App.js
index 7ec82b9a4f8a..1d2e07345c24 100644
--- a/src/App.js
+++ b/src/App.js
@@ -9,7 +9,7 @@ import {PickerStateProvider} from 'react-native-picker-select';
 import CustomStatusBar from './components/CustomStatusBar';
 import ErrorBoundary from './components/ErrorBoundary';
 import Expensify from './Expensify';
-import {LocaleContextProvider} from './components/withLocalize';
+import {LocaleContextProvider} from './components/LocaleContextProvider';
 import OnyxProvider from './components/OnyxProvider';
 import HTMLEngineProvider from './components/HTMLEngineProvider';
 import PopoverContextProvider from './components/PopoverProvider';
@@ -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 cced7994711b..0a262d868de9 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -4,6 +4,11 @@ import * as KeyCommand from 'react-native-key-command';
 import * as Url from './libs/Url';
 import SCREENS from './SCREENS';
 
+// Creating a default array and object this way because objects ({}) and arrays ([]) are not stable types.
+// Freezing the array ensures that it cannot be unintentionally modified.
+const EMPTY_ARRAY = Object.freeze([]);
+const EMPTY_OBJECT = Object.freeze({});
+
 const CLOUDFRONT_DOMAIN = 'cloudfront.net';
 const CLOUDFRONT_URL = `https://d2k5nsl2zxldvw.${CLOUDFRONT_DOMAIN}`;
 const ACTIVE_EXPENSIFY_URL = Url.addTrailingForwardSlash(Config?.NEW_EXPENSIFY_URL ?? 'https://new.expensify.com');
@@ -118,8 +123,6 @@ const CONST = {
         },
     },
 
-    RIGHT_MODAL_BACKGROUND_OVERLAY_OPACITY: 0.4,
-
     NEW_EXPENSIFY_URL: ACTIVE_EXPENSIFY_URL,
     APP_DOWNLOAD_LINKS: {
         ANDROID: `https://play.google.com/store/apps/details?id=${ANDROID_PACKAGE_NAME}`,
@@ -235,6 +238,8 @@ const CONST = {
         TASKS: 'tasks',
         THREADS: 'threads',
         CUSTOM_STATUS: 'customStatus',
+        NEW_DOT_CATEGORIES: 'newDotCategories',
+        NEW_DOT_TAGS: 'newDotTags',
     },
     BUTTON_STATES: {
         DEFAULT: 'default',
@@ -286,8 +291,8 @@ const CONST = {
             },
             type: KEYBOARD_SHORTCUT_NAVIGATION_TYPE,
         },
-        NEW_GROUP: {
-            descriptionKey: 'newGroup',
+        NEW_CHAT: {
+            descriptionKey: 'newChat',
             shortcutKey: 'K',
             modifiers: ['CTRL', 'SHIFT'],
             trigger: {
@@ -408,6 +413,8 @@ const CONST = {
     EXAMPLE_PHONE_NUMBER: '+15005550006',
     CONCIERGE_CHAT_NAME: 'Concierge',
     CLOUDFRONT_URL,
+    EMPTY_ARRAY,
+    EMPTY_OBJECT,
     USE_EXPENSIFY_URL,
     NEW_ZOOM_MEETING_URL: 'https://zoom.us/start/videomeeting',
     NEW_GOOGLE_MEET_MEETING_URL: 'https://meet.google.com/new',
@@ -433,6 +440,12 @@ const CONST = {
     INTERNAL_DEV_EXPENSIFY_URL: 'https://www.expensify.com.dev',
     STAGING_EXPENSIFY_URL: 'https://staging.expensify.com',
     EXPENSIFY_URL: 'https://www.expensify.com',
+    BANK_ACCOUNT_PERSONAL_DOCUMENTATION_INFO_URL:
+        'https://community.expensify.com/discussion/6983/faq-why-do-i-need-to-provide-personal-documentation-when-setting-up-updating-my-bank-account',
+    PERSONAL_DATA_PROTECTION_INFO_URL: 'https://community.expensify.com/discussion/5677/deep-dive-security-how-expensify-protects-your-information',
+    ONFIDO_FACIAL_SCAN_POLICY_URL: 'https://onfido.com/facial-scan-policy-and-release/',
+    ONFIDO_PRIVACY_POLICY_URL: 'https://onfido.com/privacy/',
+    ONFIDO_TERMS_OF_SERVICE_URL: 'https://onfido.com/terms-of-service/',
 
     // Use Environment.getEnvironmentURL to get the complete URL with port number
     DEV_NEW_EXPENSIFY_URL: 'http://localhost:',
@@ -727,7 +740,7 @@ const CONST = {
     },
     DEFAULT_TIME_ZONE: {automatic: true, selected: 'America/Los_Angeles'},
     DEFAULT_ACCOUNT_DATA: {errors: null, success: '', isLoading: false},
-    DEFAULT_CLOSE_ACCOUNT_DATA: {errors: {}, success: '', isLoading: false},
+    DEFAULT_CLOSE_ACCOUNT_DATA: {errors: null, success: '', isLoading: false},
     FORMS: {
         LOGIN_FORM: 'LoginForm',
         VALIDATE_CODE_FORM: 'ValidateCodeForm',
@@ -748,10 +761,17 @@ const CONST = {
     // 6 numeric digits
     VALIDATE_CODE_REGEX_STRING: /^\d{6}$/,
 
+    // 8 alphanumeric characters
+    RECOVERY_CODE_REGEX_STRING: /^[a-zA-Z0-9]{8}$/,
+
     // The server has a WAF (Web Application Firewall) which will strip out HTML/XML tags using this regex pattern.
     // It's copied here so that the same regex pattern can be used in form validations to be consistent with the server.
     VALIDATE_FOR_HTML_TAG_REGEX: /<([^>\s]+)(?:[^>]*?)>/g,
 
+    VALIDATE_FOR_LEADINGSPACES_HTML_TAG_REGEX: /<([\s]+[\s\w~!@#$%^&*(){}[\];':"`|?.,/\\+\-=<]+.*[\s]*)>/g,
+
+    WHITELISTED_TAGS: [/<>/, /< >/, /<->/, /<-->/, /<br>/, /<br\/>/],
+
     PASSWORD_PAGE: {
         ERROR: {
             ALREADY_VALIDATED: 'Account already validated',
@@ -779,6 +799,10 @@ const CONST = {
 
     INVISIBLE_CODEPOINTS: ['fe0f', '200d', '2066'],
 
+    UNICODE: {
+        LTR: '\u2066',
+    },
+
     TOOLTIP_MAX_LINES: 3,
 
     LOGIN_TYPE: {
@@ -789,6 +813,8 @@ const CONST = {
     MAGIC_CODE_LENGTH: 6,
     MAGIC_CODE_EMPTY_CHAR: ' ',
 
+    RECOVERY_CODE_LENGTH: 8,
+
     KEYBOARD_TYPE: {
         PHONE_PAD: 'phone-pad',
         NUMBER_PAD: 'number-pad',
@@ -878,8 +904,6 @@ const CONST = {
         QA: 'qa@expensify.com',
         QA_TRAVIS: 'qa+travisreceipts@expensify.com',
         RECEIPTS: 'receipts@expensify.com',
-        SAASTR: 'saastr@expensify.com',
-        SBE: 'sbe@expensify.com',
         STUDENT_AMBASSADOR: 'studentambassadors@expensify.com',
         SVFG: 'svfg@expensify.com',
     },
@@ -964,6 +988,15 @@ const CONST = {
             GOLD: 'GOLD',
             SILVER: 'SILVER',
         },
+        WEB_MESSAGE_TYPE: {
+            STATEMENT: 'STATEMENT_NAVIGATE',
+            CONCIERGE: 'CONCIERGE_NAVIGATE',
+        },
+        MTL_WALLET_PROGRAM_ID: '760',
+        PROGRAM_ISSUERS: {
+            EXPENSIFY_PAYMENTS: 'Expensify Payments LLC',
+            BANCORP_BANK: 'The Bancorp Bank',
+        },
     },
 
     PLAID: {
@@ -1015,7 +1048,6 @@ const CONST = {
     },
 
     PAYMENT_METHODS: {
-        PAYPAL: 'payPalMe',
         DEBIT_CARD: 'debitCard',
         BANK_ACCOUNT: 'bankAccount',
     },
@@ -1031,7 +1063,6 @@ const CONST = {
         PAYMENT_TYPE: {
             ELSEWHERE: 'Elsewhere',
             EXPENSIFY: 'Expensify',
-            PAYPAL_ME: 'PayPal.me',
             VBBA: 'ACH',
         },
         MONEY_REQUEST_TYPE: {
@@ -1080,6 +1111,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',
@@ -1104,6 +1158,7 @@ const CONST = {
         DISTANCE_UNIT_KILOMETERS: 'km',
         MILEAGE_IRS_RATE: 0.655,
         DEFAULT_RATE: 'Default Rate',
+        RATE_DECIMALS: 3,
     },
 
     TERMS: {
@@ -1122,6 +1177,7 @@ const CONST = {
     },
 
     AVATAR_SIZE: {
+        XLARGE: 'xlarge',
         LARGE: 'large',
         MEDIUM: 'medium',
         DEFAULT: 'default',
@@ -1136,6 +1192,7 @@ const CONST = {
         SMALL_NORMAL: 'small-normal',
     },
     EXPENSIFY_CARD: {
+        BANK: 'Expensify Card',
         FRAUD_TYPES: {
             DOMAIN: 'domain',
             INDIVIDUAL: 'individal',
@@ -1166,7 +1223,6 @@ const CONST = {
         CARD_NUMBER: /^[0-9]{15,16}$/,
         CARD_SECURITY_CODE: /^[0-9]{3,4}$/,
         CARD_EXPIRATION_DATE: /^(0[1-9]|1[0-2])([^0-9])?([0-9]{4}|([0-9]{2}))$/,
-        PAYPAL_ME_USERNAME: /^[a-zA-Z0-9]{1,20}$/,
         ROOM_NAME: /^#[a-z0-9à-ÿ-]{1,80}$/,
 
         // eslint-disable-next-line max-len, no-misleading-character-class
@@ -1181,6 +1237,7 @@ const CONST = {
         EMOJI_NAME: /:[\w+-]+:/g,
         EMOJI_SUGGESTIONS: /:[a-zA-Z0-9_+-]{1,40}$/,
         AFTER_FIRST_LINE_BREAK: /\n.*/g,
+        LINE_BREAK: /\n/g,
         CODE_2FA: /^\d{6}$/,
         ATTACHMENT_ID: /chat-attachments\/(\d+)/,
         HAS_COLON_ONLY_AT_THE_BEGINNING: /^:[^:]+$/,
@@ -1188,7 +1245,7 @@ const CONST = {
 
         SPECIAL_CHAR_OR_EMOJI:
             // eslint-disable-next-line no-misleading-character-class
-            /[\n\s,/?"{}[\]()&^%\\;`$=#<>!*\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,
+            /[\n\s,/?"{}[\]()&_~^%\\;`$=#<>!*\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,
 
         SPACE_OR_EMOJI:
             // eslint-disable-next-line no-misleading-character-class
@@ -1211,6 +1268,8 @@ const CONST = {
         DATE_TIME_FORMAT: /^\d{2}-\d{2} \d{2}:\d{2} [AP]M$/,
         ATTACHMENT_ROUTE: /\/r\/(\d*)\/attachment/,
         ILLEGAL_FILENAME_CHARACTERS: /\/|<|>|\*|"|:|\?|\\|\|/g,
+
+        ENCODE_PERCENT_CHARACTER: /%(25)+/g,
     },
 
     PRONOUNS: {
@@ -1270,9 +1329,9 @@ const CONST = {
     },
 
     // Auth limit is 60k for the column but we store edits and other metadata along the html so let's use a lower limit to accommodate for it.
-    MAX_COMMENT_LENGTH: 15000,
+    MAX_COMMENT_LENGTH: 10000,
 
-    // Furthermore, applying markup is very resource-consuming, so let's set a slightly lower limit for that
+    // Use the same value as MAX_COMMENT_LENGTH to ensure the entire comment is parsed. Note that applying markup is very resource-consuming.
     MAX_MARKUP_LENGTH: 10000,
 
     MAX_THREAD_REPLIES_PREVIEW: 99,
@@ -1308,6 +1367,7 @@ const CONST = {
         SETTINGS: 'settings',
         LEAVE_ROOM: 'leaveRoom',
         WELCOME_MESSAGE: 'welcomeMessage',
+        PRIVATE_NOTES: 'privateNotes',
     },
     EDIT_REQUEST_FIELD: {
         AMOUNT: 'amount',
@@ -1315,6 +1375,10 @@ const CONST = {
         DATE: 'date',
         DESCRIPTION: 'description',
         MERCHANT: 'merchant',
+        CATEGORY: 'category',
+        RECEIPT: 'receipt',
+        DISTANCE: 'distance',
+        TAG: 'tag',
     },
     FOOTER: {
         EXPENSE_MANAGEMENT_URL: `${USE_EXPENSIFY_URL}/expense-management`,
@@ -2496,32 +2560,6 @@ const CONST = {
         SEARCH_ISSUES: 'https://github.com/Expensify/App/issues',
     },
 
-    PAYPAL_SUPPORTED_CURRENCIES: [
-        'AUD',
-        'BRL',
-        'CAD',
-        'CZK',
-        'DKK',
-        'EUR',
-        'HKD',
-        'HUF',
-        'ILS',
-        'JPY',
-        'MYR',
-        'MXN',
-        'TWD',
-        'NZD',
-        'NOK',
-        'PHP',
-        'PLN',
-        'GBP',
-        'RUB',
-        'SGD',
-        'SEK',
-        'CHF',
-        'THB',
-        'USD',
-    ],
     CONCIERGE_TRAVEL_URL: 'https://community.expensify.com/discussion/7066/introducing-concierge-travel',
     SCREEN_READER_STATES: {
         ALL: 'all',
@@ -2590,6 +2628,9 @@ const CONST = {
         DISABLED: 'DISABLED',
     },
     TAB: {
+        NEW_CHAT_TAB_ID: 'NewChatTab',
+        NEW_CHAT: 'chat',
+        NEW_ROOM: 'room',
         RECEIPT_TAB_ID: 'ReceiptTab',
         MANUAL: 'manual',
         SCAN: 'scan',
@@ -2618,6 +2659,7 @@ const CONST = {
     INDENTS: '    ',
     PARENT_CHILD_SEPARATOR: ': ',
     CATEGORY_LIST_THRESHOLD: 8,
+    TAG_LIST_THRESHOLD: 8,
     DEMO_PAGES: {
         SAASTR: 'SaaStrDemoSetup',
         SBE: 'SbeDemoSetup',
@@ -2633,6 +2675,15 @@ const CONST = {
         HTTPS: 'https',
         PUSHER: 'pusher',
     },
+    EVENTS: {
+        SCROLLING: 'scrolling',
+    },
+    HORIZONTAL_SPACER: {
+        DEFAULT_BORDER_BOTTOM_WIDTH: 1,
+        DEFAULT_MARGIN_VERTICAL: 8,
+        HIDDEN_MARGIN_VERTICAL: 0,
+        HIDDEN_BORDER_BOTTOM_WIDTH: 0,
+    },
 } as const;
 
 export default CONST;
diff --git a/src/Expensify.js b/src/Expensify.js
index 60ab9f756dff..9e6ae1ff27b4 100644
--- a/src/Expensify.js
+++ b/src/Expensify.js
@@ -30,8 +30,6 @@ import KeyboardShortcutsModal from './components/KeyboardShortcutsModal';
 import AppleAuthWrapper from './components/SignInButtons/AppleAuthWrapper';
 import EmojiPicker from './components/EmojiPicker/EmojiPicker';
 import * as EmojiPickerAction from './libs/actions/EmojiPickerAction';
-import * as DemoActions from './libs/actions/DemoActions';
-import DownloadAppModal from './components/DownloadAppModal';
 import DeeplinkWrapper from './components/DeeplinkWrapper';
 
 // This lib needs to be imported, but it has nothing to export since all it contains is an Onyx connection
@@ -101,7 +99,9 @@ function Expensify(props) {
     const [hasAttemptedToOpenPublicRoom, setAttemptedToOpenPublicRoom] = useState(false);
 
     useEffect(() => {
-        if (props.isCheckingPublicRoom) return;
+        if (props.isCheckingPublicRoom) {
+            return;
+        }
         setAttemptedToOpenPublicRoom(true);
     }, [props.isCheckingPublicRoom]);
 
@@ -168,13 +168,11 @@ function Expensify(props) {
 
         // If the app is opened from a deep link, get the reportID (if exists) from the deep link and navigate to the chat report
         Linking.getInitialURL().then((url) => {
-            DemoActions.runDemoByURL(url);
             Report.openReportFromDeepLink(url, isAuthenticated);
         });
 
         // Open chat report from a deep link (only mobile native)
         Linking.addEventListener('url', (state) => {
-            DemoActions.runDemoByURL(state.url);
             Report.openReportFromDeepLink(state.url, isAuthenticated);
         });
 
@@ -196,7 +194,6 @@ function Expensify(props) {
         <DeeplinkWrapper isAuthenticated={isAuthenticated}>
             {shouldInit && (
                 <>
-                    <DownloadAppModal isAuthenticated={isAuthenticated} />
                     <KeyboardShortcutsModal />
                     <GrowlNotification ref={Growl.growlRef} />
                     <PopoverReportActionContextMenu ref={ReportActionContextMenu.contextMenuRef} />
diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index b978f06dbfd9..a1afc4fef2c1 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -29,9 +29,6 @@ const ONYXKEYS = {
     /** Note: These are Persisted Requests - not all requests in the main queue as the key name might lead one to believe */
     PERSISTED_REQUESTS: 'networkRequestQueue',
 
-    /** Onyx updates from a response, or success or failure data from a request. */
-    QUEUED_ONYX_UPDATES: 'queuedOnyxUpdates',
-
     /** Stores current date */
     CURRENT_DATE: 'currentDate',
 
@@ -87,13 +84,7 @@ const ONYXKEYS = {
     SESSION: 'session',
     BETAS: 'betas',
 
-    /** Denotes if the Download App Banner has been dismissed */
-    SHOW_DOWNLOAD_APP_BANNER: 'showDownloadAppBanner',
-
     /** NVP keys
-     * Contains the user's payPalMe data */
-    PAYPAL: 'paypal',
-
     /** Contains the user preference for the LHN priority mode */
     NVP_PRIORITY_MODE: 'nvp_priorityMode',
 
@@ -175,6 +166,9 @@ const ONYXKEYS = {
     /** Is report data loading? */
     IS_LOADING_REPORT_DATA: 'isLoadingReportData',
 
+    /** Is report data loading? */
+    IS_LOADING_APP: 'isLoadingApp',
+
     /** Is Keyboard shortcuts modal open? */
     IS_SHORTCUTS_MODAL_OPEN: 'isShortcutsModalOpen',
 
@@ -215,9 +209,6 @@ const ONYXKEYS = {
     // The last update ID that was applied to the client
     ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT: 'OnyxUpdatesLastUpdateIDAppliedToClient',
 
-    // Manual request tab selector
-    SELECTED_TAB: 'selectedTab',
-
     // Receipt upload modal
     RECEIPT_MODAL: 'receiptModal',
 
@@ -243,8 +234,11 @@ 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_METADATA: 'reportMetadata_',
         REPORT_ACTIONS: 'reportActions_',
         REPORT_ACTIONS_DRAFTS: 'reportActionsDrafts_',
         REPORT_ACTIONS_REACTIONS: 'reportActionsReactions_',
@@ -252,9 +246,13 @@ const ONYXKEYS = {
         REPORT_DRAFT_COMMENT_NUMBER_OF_LINES: 'reportDraftCommentNumberOfLines_',
         REPORT_IS_COMPOSER_FULL_SIZE: 'reportIsComposerFullSize_',
         REPORT_USER_IS_TYPING: 'reportUserIsTyping_',
+        REPORT_USER_IS_LEAVING_ROOM: 'reportUserIsLeavingRoom_',
         SECURITY_GROUP: 'securityGroup_',
         TRANSACTION: 'transactions_',
 
+        // Manual request tab selector
+        SELECTED_TAB: 'selectedTab_',
+
         /** This is deprecated, but needed for a migration, so we still need to include it here so that it will be initialized in Onyx.init */
         DEPRECATED_POLICY_MEMBER_LIST: 'policyMemberList_',
     },
@@ -282,12 +280,12 @@ const ONYXKEYS = {
         MONEY_REQUEST_AMOUNT_FORM: 'moneyRequestAmountForm',
         MONEY_REQUEST_DATE_FORM: 'moneyRequestCreatedForm',
         NEW_CONTACT_METHOD_FORM: 'newContactMethodForm',
-        PAYPAL_FORM: 'payPalForm',
         WAYPOINT_FORM: 'waypointForm',
         WAYPOINT_FORM_DRAFT: 'waypointFormDraft',
         SETTINGS_STATUS_SET_FORM: 'settingsStatusSetForm',
         SETTINGS_STATUS_CLEAR_AFTER_FORM: 'settingsStatusClearAfterForm',
         SETTINGS_STATUS_SET_CLEAR_AFTER_FORM: 'settingsStatusSetClearAfterForm',
+        PRIVATE_NOTES_FORM: 'privateNotesForm',
         I_KNOW_A_TEACHER_FORM: 'iKnowTeacherForm',
         INTRO_SCHOOL_PRINCIPAL_FORM: 'introSchoolPrincipalForm',
     },
@@ -304,9 +302,7 @@ type OnyxValues = {
     [ONYXKEYS.ACTIVE_CLIENTS]: string[];
     [ONYXKEYS.DEVICE_ID]: string;
     [ONYXKEYS.IS_SIDEBAR_LOADED]: boolean;
-    [ONYXKEYS.SHOW_DOWNLOAD_APP_BANNER]: boolean;
     [ONYXKEYS.PERSISTED_REQUESTS]: OnyxTypes.Request[];
-    [ONYXKEYS.QUEUED_ONYX_UPDATES]: OnyxTypes.QueuedOnyxUpdates;
     [ONYXKEYS.CURRENT_DATE]: string;
     [ONYXKEYS.CREDENTIALS]: OnyxTypes.Credentials;
     [ONYXKEYS.IOU]: OnyxTypes.IOU;
@@ -325,12 +321,11 @@ type OnyxValues = {
     [ONYXKEYS.LOGIN_LIST]: OnyxTypes.Login;
     [ONYXKEYS.SESSION]: OnyxTypes.Session;
     [ONYXKEYS.BETAS]: OnyxTypes.Beta[];
-    [ONYXKEYS.PAYPAL]: OnyxTypes.Paypal;
     [ONYXKEYS.NVP_PRIORITY_MODE]: ValueOf<typeof CONST.PRIORITY_MODE>;
     [ONYXKEYS.NVP_BLOCKED_FROM_CONCIERGE]: OnyxTypes.BlockedFromConcierge;
     [ONYXKEYS.NVP_PRIVATE_PUSH_NOTIFICATION_ID]: string;
     [ONYXKEYS.NVP_LAST_PAYMENT_METHOD]: Record<string, string>;
-    [ONYXKEYS.NVP_RECENT_WAYPOINTS]: OnyxTypes.RecentWaypoints[];
+    [ONYXKEYS.NVP_RECENT_WAYPOINTS]: OnyxTypes.RecentWaypoint[];
     [ONYXKEYS.PUSH_NOTIFICATIONS_ENABLED]: boolean;
     [ONYXKEYS.PLAID_DATA]: OnyxTypes.PlaidData;
     [ONYXKEYS.IS_PLAID_DISABLED]: boolean;
@@ -364,8 +359,6 @@ type OnyxValues = {
     [ONYXKEYS.LAST_OPENED_PUBLIC_ROOM_ID]: string;
     [ONYXKEYS.PREFERRED_THEME]: ValueOf<typeof CONST.THEME>;
     [ONYXKEYS.IS_USING_MEMORY_ONLY_KEYS]: boolean;
-    [ONYXKEYS.SELECTED_TAB]: string;
-    [ONYXKEYS.RECEIPT_MODAL]: OnyxTypes.ReceiptModal;
     [ONYXKEYS.MAPBOX_ACCESS_TOKEN]: OnyxTypes.MapboxAccessToken;
     [ONYXKEYS.ONYX_UPDATES_FROM_SERVER]: OnyxTypes.OnyxUpdatesFromServer;
     [ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT]: number;
@@ -376,12 +369,14 @@ type OnyxValues = {
     // Collections
     [ONYXKEYS.COLLECTION.DOWNLOAD]: OnyxTypes.Download;
     [ONYXKEYS.COLLECTION.POLICY]: OnyxTypes.Policy;
-    [ONYXKEYS.COLLECTION.POLICY_CATEGORIES]: unknown;
+    [ONYXKEYS.COLLECTION.POLICY_CATEGORIES]: OnyxTypes.PolicyCategory;
+    [ONYXKEYS.COLLECTION.POLICY_TAGS]: OnyxTypes.PolicyTag;
     [ONYXKEYS.COLLECTION.POLICY_MEMBERS]: OnyxTypes.PolicyMember;
     [ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES]: OnyxTypes.RecentlyUsedCategories;
     [ONYXKEYS.COLLECTION.DEPRECATED_POLICY_MEMBER_LIST]: OnyxTypes.PolicyMember;
     [ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT]: Record<string, number>;
     [ONYXKEYS.COLLECTION.REPORT]: OnyxTypes.Report;
+    [ONYXKEYS.COLLECTION.REPORT_METADATA]: OnyxTypes.ReportMetadata;
     [ONYXKEYS.COLLECTION.REPORT_ACTIONS]: OnyxTypes.ReportAction;
     [ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS]: string;
     [ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS]: OnyxTypes.ReportActionReactions;
@@ -389,8 +384,11 @@ type OnyxValues = {
     [ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT_NUMBER_OF_LINES]: number;
     [ONYXKEYS.COLLECTION.REPORT_IS_COMPOSER_FULL_SIZE]: boolean;
     [ONYXKEYS.COLLECTION.REPORT_USER_IS_TYPING]: boolean;
+    [ONYXKEYS.COLLECTION.REPORT_USER_IS_LEAVING_ROOM]: boolean;
     [ONYXKEYS.COLLECTION.SECURITY_GROUP]: OnyxTypes.SecurityGroup;
     [ONYXKEYS.COLLECTION.TRANSACTION]: OnyxTypes.Transaction;
+    [ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS]: OnyxTypes.RecentlyUsedTags;
+    [ONYXKEYS.COLLECTION.SELECTED_TAB]: string;
 
     // Forms
     [ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM]: OnyxTypes.AddDebitCardForm;
@@ -415,7 +413,6 @@ type OnyxValues = {
     [ONYXKEYS.FORMS.MONEY_REQUEST_DATE_FORM]: OnyxTypes.Form;
     [ONYXKEYS.FORMS.MONEY_REQUEST_DATE_FORM]: OnyxTypes.Form;
     [ONYXKEYS.FORMS.NEW_CONTACT_METHOD_FORM]: OnyxTypes.Form;
-    [ONYXKEYS.FORMS.PAYPAL_FORM]: OnyxTypes.Form;
     [ONYXKEYS.FORMS.WAYPOINT_FORM]: OnyxTypes.Form;
     [ONYXKEYS.FORMS.WAYPOINT_FORM_DRAFT]: OnyxTypes.Form;
     [ONYXKEYS.FORMS.SETTINGS_STATUS_SET_FORM]: OnyxTypes.Form;
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index ed4fbb97a41a..b2dafa643b22 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -1,36 +1,58 @@
 import {ValueOf} from 'type-fest';
-import * as Url from './libs/Url';
 import CONST from './CONST';
 
 /**
  * This is a file containing constants for all of the routes we want to be able to go to
  */
 
-type ParseReportRouteParams = {
-    reportID: string;
-    isSubReportPageRoute: boolean;
-};
+export default {
+    HOME: '',
+    /** This is a utility route used to go to the user's concierge chat, or the sign-in page if the user's not authenticated */
+    CONCIERGE: 'concierge',
+    FLAG_COMMENT: {
+        route: 'flag/:reportID/:reportActionID',
+        getRoute: (reportID: string, reportActionID: string) => `flag/${reportID}/${reportActionID}`,
+    },
+    SEARCH: 'search',
+    DETAILS: {
+        route: 'details',
+        getRoute: (login: string) => `details?login=${encodeURIComponent(login)}`,
+    },
+    PROFILE: {
+        route: 'a/:accountID',
+        getRoute: (accountID: string | number, backTo = '') => {
+            const backToParam = backTo ? `?backTo=${encodeURIComponent(backTo)}` : '';
+            return `a/${accountID}${backToParam}`;
+        },
+    },
 
-const REPORT = 'r';
-const IOU_REQUEST = 'request/new';
-const IOU_BILL = 'split/new';
-const IOU_SEND = 'send/new';
-const NEW_TASK = 'new/task';
-const SETTINGS_PERSONAL_DETAILS = 'settings/profile/personal-details';
-const SETTINGS_CONTACT_METHODS = 'settings/profile/contact-methods';
-const SETTINGS_STATUS = 'settings/profile/status';
-const SETTINGS_STATUS_SET = 'settings/profile/status/set';
+    TRANSITION_BETWEEN_APPS: 'transition',
+    VALIDATE_LOGIN: 'v/:accountID/:validateCode',
+    GET_ASSISTANCE: {
+        route: 'get-assistance/:taskID',
+        getRoute: (taskID: string) => `get-assistance/${taskID}`,
+    },
+    UNLINK_LOGIN: 'u/:accountID/:validateCode',
+    APPLE_SIGN_IN: 'sign-in-with-apple',
+    GOOGLE_SIGN_IN: 'sign-in-with-google',
+    DESKTOP_SIGN_IN_REDIRECT: 'desktop-signin-redirect',
+    // This is a special validation URL that will take the user to /workspace/new after validation. This is used
+    // when linking users from e.com in order to share a session in this app.
+    ENABLE_PAYMENTS: 'enable-payments',
+    WALLET_STATEMENT_WITH_DATE: 'statements/:yearMonth',
+    SIGN_IN_MODAL: 'sign-in-modal',
 
-export default {
     BANK_ACCOUNT: 'bank-account',
     BANK_ACCOUNT_NEW: 'bank-account/new',
-    BANK_ACCOUNT_WITH_STEP_TO_OPEN: 'bank-account/:stepToOpen?',
     BANK_ACCOUNT_PERSONAL: 'bank-account/personal',
-    getBankAccountRoute: (stepToOpen = '', policyID = '', backTo = ''): string => {
-        const backToParam = backTo ? `&backTo=${encodeURIComponent(backTo)}` : '';
-        return `bank-account/${stepToOpen}?policyID=${policyID}${backToParam}`;
+    BANK_ACCOUNT_WITH_STEP_TO_OPEN: {
+        route: 'bank-account/:stepToOpen?',
+        getRoute: (stepToOpen = '', policyID = '', backTo = ''): string => {
+            const backToParam = backTo ? `&backTo=${encodeURIComponent(backTo)}` : '';
+            return `bank-account/${stepToOpen}?policyID=${policyID}${backToParam}`;
+        },
     },
-    HOME: '',
+
     SETTINGS: 'settings',
     SETTINGS_PROFILE: 'settings/profile',
     SETTINGS_SHARE_CODE: 'settings/shareCode',
@@ -49,177 +71,251 @@ export default {
     SETTINGS_ABOUT: 'settings/about',
     SETTINGS_APP_DOWNLOAD_LINKS: 'settings/about/app-download-links',
     SETTINGS_WALLET: 'settings/wallet',
-    SETTINGS_ADD_PAYPAL_ME: 'settings/wallet/add-paypal-me',
+    SETTINGS_WALLET_DOMAINCARDS: {
+        route: '/settings/wallet/card/:domain',
+        getRoute: (domain: string) => `/settings/wallet/card/${domain}`,
+    },
     SETTINGS_ADD_DEBIT_CARD: 'settings/wallet/add-debit-card',
     SETTINGS_ADD_BANK_ACCOUNT: 'settings/wallet/add-bank-account',
     SETTINGS_ENABLE_PAYMENTS: 'settings/wallet/enable-payments',
-    getSettingsAddLoginRoute: (type: string) => `settings/addlogin/${type}`,
     SETTINGS_WALLET_TRANSFER_BALANCE: 'settings/wallet/transfer-balance',
     SETTINGS_WALLET_CHOOSE_TRANSFER_ACCOUNT: 'settings/wallet/choose-transfer-account',
-    SETTINGS_PERSONAL_DETAILS,
-    SETTINGS_PERSONAL_DETAILS_LEGAL_NAME: `${SETTINGS_PERSONAL_DETAILS}/legal-name`,
-    SETTINGS_PERSONAL_DETAILS_DATE_OF_BIRTH: `${SETTINGS_PERSONAL_DETAILS}/date-of-birth`,
-    SETTINGS_PERSONAL_DETAILS_ADDRESS: `${SETTINGS_PERSONAL_DETAILS}/address`,
-    SETTINGS_CONTACT_METHODS,
-    SETTINGS_CONTACT_METHOD_DETAILS: `${SETTINGS_CONTACT_METHODS}/:contactMethod/details`,
-    getEditContactMethodRoute: (contactMethod: string) => `${SETTINGS_CONTACT_METHODS}/${encodeURIComponent(contactMethod)}/details`,
-    SETTINGS_NEW_CONTACT_METHOD: `${SETTINGS_CONTACT_METHODS}/new`,
+    SETTINGS_PERSONAL_DETAILS: 'settings/profile/personal-details',
+    SETTINGS_PERSONAL_DETAILS_LEGAL_NAME: 'settings/profile/personal-details/legal-name',
+    SETTINGS_PERSONAL_DETAILS_DATE_OF_BIRTH: 'settings/profile/personal-details/date-of-birth',
+    SETTINGS_PERSONAL_DETAILS_ADDRESS: 'settings/profile/personal-details/address',
+    SETTINGS_PERSONAL_DETAILS_ADDRESS_COUNTRY: {
+        route: 'settings/profile/personal-details/address/country',
+        getRoute: (country: string, backTo?: string) => {
+            let route = `settings/profile/personal-details/address/country?country=${country}`;
+            if (backTo) {
+                route += `&backTo=${encodeURIComponent(backTo)}`;
+            }
+            return route;
+        },
+    },
+    SETTINGS_CONTACT_METHODS: 'settings/profile/contact-methods',
+    SETTINGS_CONTACT_METHOD_DETAILS: {
+        route: 'settings/profile/contact-methods/:contactMethod/details',
+        getRoute: (contactMethod: string) => `settings/profile/contact-methods/${encodeURIComponent(contactMethod)}/details`,
+    },
+    SETTINGS_NEW_CONTACT_METHOD: 'settings/profile/contact-methods/new',
     SETTINGS_2FA: 'settings/security/two-factor-auth',
-    SETTINGS_STATUS,
-    SETTINGS_STATUS_SET,
-    NEW_GROUP: 'new/group',
-    NEW_CHAT: 'new/chat',
-    NEW_TASK,
-    REPORT,
-    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',
-    getEditRequestCurrencyRoute: (threadReportID: string, currency: string, backTo: string) => `r/${threadReportID}/edit/currency?currency=${currency}&backTo=${backTo}`,
-    getReportRoute: (reportID: string) => `r/${reportID}`,
-    REPORT_WITH_ID_DETAILS_SHARE_CODE: 'r/:reportID/details/shareCode',
-    getReportShareCodeRoute: (reportID: string) => `r/${reportID}/details/shareCode`,
-    REPORT_ATTACHMENTS: 'r/:reportID/attachment',
-    getReportAttachmentRoute: (reportID: string, source: string) => `r/${reportID}/attachment?source=${encodeURI(source)}`,
+    SETTINGS_STATUS: 'settings/profile/status',
+    SETTINGS_STATUS_SET: 'settings/profile/status/set',
 
-    /** This is a utility route used to go to the user's concierge chat, or the sign-in page if the user's not authenticated */
-    CONCIERGE: 'concierge',
+    NEW: 'new',
+    NEW_CHAT: 'new/chat',
+    NEW_ROOM: 'new/room',
 
-    IOU_REQUEST,
-    IOU_BILL,
-    IOU_SEND,
+    REPORT: 'r',
+    REPORT_WITH_ID: {
+        route: 'r/:reportID?/:reportActionID?',
+        getRoute: (reportID: string) => `r/${reportID}`,
+    },
+    EDIT_REQUEST: {
+        route: 'r/:threadReportID/edit/:field',
+        getRoute: (threadReportID: string, field: ValueOf<typeof CONST.EDIT_REQUEST_FIELD>) => `r/${threadReportID}/edit/${field}`,
+    },
+    EDIT_CURRENCY_REQUEST: {
+        route: 'r/:threadReportID/edit/currency',
+        getRoute: (threadReportID: string, currency: string, backTo: string) => `r/${threadReportID}/edit/currency?currency=${currency}&backTo=${backTo}`,
+    },
+    REPORT_WITH_ID_DETAILS_SHARE_CODE: {
+        route: 'r/:reportID/details/shareCode',
+        getRoute: (reportID: string) => `r/${reportID}/details/shareCode`,
+    },
+    REPORT_ATTACHMENTS: {
+        route: 'r/:reportID/attachment',
+        getRoute: (reportID: string, source: string) => `r/${reportID}/attachment?source=${encodeURI(source)}`,
+    },
+    REPORT_PARTICIPANTS: {
+        route: 'r/:reportID/participants',
+        getRoute: (reportID: string) => `r/${reportID}/participants`,
+    },
+    REPORT_WITH_ID_DETAILS: {
+        route: 'r/:reportID/details',
+        getRoute: (reportID: string) => `r/${reportID}/details`,
+    },
+    REPORT_SETTINGS: {
+        route: 'r/:reportID/settings',
+        getRoute: (reportID: string) => `r/${reportID}/settings`,
+    },
+    REPORT_SETTINGS_ROOM_NAME: {
+        route: 'r/:reportID/settings/room-name',
+        getRoute: (reportID: string) => `r/${reportID}/settings/room-name`,
+    },
+    REPORT_SETTINGS_NOTIFICATION_PREFERENCES: {
+        route: 'r/:reportID/settings/notification-preferences',
+        getRoute: (reportID: string) => `r/${reportID}/settings/notification-preferences`,
+    },
+    REPORT_SETTINGS_WRITE_CAPABILITY: {
+        route: 'r/:reportID/settings/who-can-post',
+        getRoute: (reportID: string) => `r/${reportID}/settings/who-can-post`,
+    },
+    REPORT_WELCOME_MESSAGE: {
+        route: 'r/:reportID/welcomeMessage',
+        getRoute: (reportID: string) => `r/${reportID}/welcomeMessage`,
+    },
+    SPLIT_BILL_DETAILS: {
+        route: 'r/:reportID/split/:reportActionID',
+        getRoute: (reportID: string, reportActionID: string) => `r/${reportID}/split/${reportActionID}`,
+    },
+    TASK_TITLE: {
+        route: 'r/:reportID/title',
+        getRoute: (reportID: string) => `r/${reportID}/title`,
+    },
+    TASK_DESCRIPTION: {
+        route: 'r/:reportID/description',
+        getRoute: (reportID: string) => `r/${reportID}/description`,
+    },
+    TASK_ASSIGNEE: {
+        route: 'r/:reportID/assignee',
+        getRoute: (reportID: string) => `r/${reportID}/assignee`,
+    },
+    PRIVATE_NOTES_VIEW: {
+        route: 'r/:reportID/notes/:accountID',
+        getRoute: (reportID: string, accountID: string | number) => `r/${reportID}/notes/${accountID}`,
+    },
+    PRIVATE_NOTES_LIST: {
+        route: 'r/:reportID/notes',
+        getRoute: (reportID: string) => `r/${reportID}/notes`,
+    },
+    PRIVATE_NOTES_EDIT: {
+        route: 'r/:reportID/notes/:accountID/edit',
+        getRoute: (reportID: string, accountID: string | number) => `r/${reportID}/notes/${accountID}/edit`,
+    },
 
     // To see the available iouType, please refer to CONST.IOU.MONEY_REQUEST_TYPE
-    MONEY_REQUEST: ':iouType/new/:reportID?',
-    MONEY_REQUEST_AMOUNT: ':iouType/new/amount/:reportID?',
-    MONEY_REQUEST_PARTICIPANTS: ':iouType/new/participants/:reportID?',
-    MONEY_REQUEST_CONFIRMATION: ':iouType/new/confirmation/:reportID?',
-    MONEY_REQUEST_DATE: ':iouType/new/date/:reportID?',
-    MONEY_REQUEST_CURRENCY: ':iouType/new/currency/:reportID?',
-    MONEY_REQUEST_DESCRIPTION: ':iouType/new/description/:reportID?',
-    MONEY_REQUEST_CATEGORY: ':iouType/new/category/:reportID?',
-    MONEY_REQUEST_MERCHANT: ':iouType/new/merchant/:reportID?',
+    MONEY_REQUEST: {
+        route: ':iouType/new/:reportID?',
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/${reportID}`,
+    },
+    MONEY_REQUEST_AMOUNT: {
+        route: ':iouType/new/amount/:reportID?',
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/amount/${reportID}`,
+    },
+    MONEY_REQUEST_PARTICIPANTS: {
+        route: ':iouType/new/participants/:reportID?',
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/participants/${reportID}`,
+    },
+    MONEY_REQUEST_CONFIRMATION: {
+        route: ':iouType/new/confirmation/:reportID?',
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/confirmation/${reportID}`,
+    },
+    MONEY_REQUEST_DATE: {
+        route: ':iouType/new/date/:reportID?',
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/date/${reportID}`,
+    },
+    MONEY_REQUEST_CURRENCY: {
+        route: ':iouType/new/currency/:reportID?',
+        getRoute: (iouType: string, reportID: string, currency: string, backTo: string) => `${iouType}/new/currency/${reportID}?currency=${currency}&backTo=${backTo}`,
+    },
+    MONEY_REQUEST_DESCRIPTION: {
+        route: ':iouType/new/description/:reportID?',
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/description/${reportID}`,
+    },
+    MONEY_REQUEST_CATEGORY: {
+        route: ':iouType/new/category/:reportID?',
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/category/${reportID}`,
+    },
+    MONEY_REQUEST_TAG: {
+        route: ':iouType/new/tag/:reportID?',
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/tag/${reportID}`,
+    },
+    MONEY_REQUEST_MERCHANT: {
+        route: ':iouType/new/merchant/:reportID?',
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/merchant/${reportID}`,
+    },
+    MONEY_REQUEST_WAYPOINT: {
+        route: ':iouType/new/waypoint/:waypointIndex',
+        getRoute: (iouType: string, waypointIndex: number) => `${iouType}/new/waypoint/${waypointIndex}`,
+    },
+    MONEY_REQUEST_RECEIPT: {
+        route: ':iouType/new/receipt/:reportID?',
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/receipt/${reportID}`,
+    },
+    MONEY_REQUEST_DISTANCE: {
+        route: ':iouType/new/address/:reportID?',
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/address/${reportID}`,
+    },
+    MONEY_REQUEST_EDIT_WAYPOINT: {
+        route: 'r/:threadReportID/edit/distance/:transactionID/waypoint/:waypointIndex',
+        getRoute: (threadReportID: number, transactionID: string, waypointIndex: number) => `r/${threadReportID}/edit/distance/${transactionID}/waypoint/${waypointIndex}`,
+    },
+    MONEY_REQUEST_DISTANCE_TAB: {
+        route: ':iouType/new/:reportID?/distance',
+        getRoute: (iouType: string, reportID = '') => `${iouType}/new/${reportID}/distance`,
+    },
     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',
-    IOU_SEND_ADD_BANK_ACCOUNT: `${IOU_SEND}/add-bank-account`,
-    IOU_SEND_ADD_DEBIT_CARD: `${IOU_SEND}/add-debit-card`,
-    IOU_SEND_ENABLE_PAYMENTS: `${IOU_SEND}/enable-payments`,
-    getMoneyRequestRoute: (iouType: string, reportID = '') => `${iouType}/new/${reportID}`,
-    getMoneyRequestAmountRoute: (iouType: string, reportID = '') => `${iouType}/new/amount/${reportID}`,
-    getMoneyRequestParticipantsRoute: (iouType: string, reportID = '') => `${iouType}/new/participants/${reportID}`,
-    getMoneyRequestConfirmationRoute: (iouType: string, reportID = '') => `${iouType}/new/confirmation/${reportID}`,
-    getMoneyRequestCreatedRoute: (iouType: string, reportID = '') => `${iouType}/new/date/${reportID}`,
-    getMoneyRequestCurrencyRoute: (iouType: string, reportID: string, currency: string, backTo: string) => `${iouType}/new/currency/${reportID}?currency=${currency}&backTo=${backTo}`,
-    getMoneyRequestDescriptionRoute: (iouType: string, reportID = '') => `${iouType}/new/description/${reportID}`,
-    getMoneyRequestCategoryRoute: (iouType: string, reportID = '') => `${iouType}/new/category/${reportID}`,
-    getMoneyRequestMerchantRoute: (iouType: string, reportID = '') => `${iouType}/new/merchant/${reportID}`,
-    getMoneyRequestDistanceTabRoute: (iouType: string, reportID = '') => `${iouType}/new/${reportID}/distance`,
-    getMoneyRequestWaypointRoute: (iouType: string, waypointIndex: number) => `${iouType}/new/waypoint/${waypointIndex}`,
-    SPLIT_BILL_DETAILS: `r/:reportID/split/:reportActionID`,
-    getSplitBillDetailsRoute: (reportID: string, reportActionID: string) => `r/${reportID}/split/${reportActionID}`,
-    getNewTaskRoute: (reportID: string) => `${NEW_TASK}/${reportID}`,
-    NEW_TASK_WITH_REPORT_ID: `${NEW_TASK}/:reportID?`,
-    TASK_TITLE: 'r/:reportID/title',
-    TASK_DESCRIPTION: 'r/:reportID/description',
-    TASK_ASSIGNEE: 'r/:reportID/assignee',
-    getTaskReportTitleRoute: (reportID: string) => `r/${reportID}/title`,
-    getTaskReportDescriptionRoute: (reportID: string) => `r/${reportID}/description`,
-    getTaskReportAssigneeRoute: (reportID: string) => `r/${reportID}/assignee`,
-    NEW_TASK_ASSIGNEE: `${NEW_TASK}/assignee`,
-    NEW_TASK_SHARE_DESTINATION: `${NEW_TASK}/share-destination`,
-    NEW_TASK_DETAILS: `${NEW_TASK}/details`,
-    NEW_TASK_TITLE: `${NEW_TASK}/title`,
-    NEW_TASK_DESCRIPTION: `${NEW_TASK}/description`,
-    FLAG_COMMENT: `flag/:reportID/:reportActionID`,
-    getFlagCommentRoute: (reportID: 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',
-    DETAILS: 'details',
-    getDetailsRoute: (login: string) => `details?login=${encodeURIComponent(login)}`,
-    PROFILE: 'a/:accountID',
-    getProfileRoute: (accountID: string | number, backTo = '') => {
-        const backToParam = backTo ? `?backTo=${encodeURIComponent(backTo)}` : '';
-        return `a/${accountID}${backToParam}`;
-    },
-    REPORT_PARTICIPANTS: 'r/:reportID/participants',
-    getReportParticipantsRoute: (reportID: string) => `r/${reportID}/participants`,
-    REPORT_WITH_ID_DETAILS: 'r/:reportID/details',
-    getReportDetailsRoute: (reportID: string) => `r/${reportID}/details`,
-    REPORT_SETTINGS: 'r/:reportID/settings',
-    getReportSettingsRoute: (reportID: string) => `r/${reportID}/settings`,
-    REPORT_SETTINGS_ROOM_NAME: 'r/:reportID/settings/room-name',
-    getReportSettingsRoomNameRoute: (reportID: string) => `r/${reportID}/settings/room-name`,
-    REPORT_SETTINGS_NOTIFICATION_PREFERENCES: 'r/:reportID/settings/notification-preferences',
-    getReportSettingsNotificationPreferencesRoute: (reportID: string) => `r/${reportID}/settings/notification-preferences`,
-    REPORT_WELCOME_MESSAGE: 'r/:reportID/welcomeMessage',
-    getReportWelcomeMessageRoute: (reportID: string) => `r/${reportID}/welcomeMessage`,
-    REPORT_SETTINGS_WRITE_CAPABILITY: 'r/:reportID/settings/who-can-post',
-    getReportSettingsWriteCapabilityRoute: (reportID: string) => `r/${reportID}/settings/who-can-post`,
-    TRANSITION_BETWEEN_APPS: 'transition',
-    VALIDATE_LOGIN: 'v/:accountID/:validateCode',
-    GET_ASSISTANCE: 'get-assistance/:taskID',
-    getGetAssistanceRoute: (taskID: string) => `get-assistance/${taskID}`,
-    UNLINK_LOGIN: 'u/:accountID/:validateCode',
 
-    APPLE_SIGN_IN: 'sign-in-with-apple',
-    GOOGLE_SIGN_IN: 'sign-in-with-google',
-    DESKTOP_SIGN_IN_REDIRECT: 'desktop-signin-redirect',
+    IOU_REQUEST: 'request/new',
+    IOU_SEND: 'send/new',
+    IOU_SEND_ADD_BANK_ACCOUNT: 'send/new/add-bank-account',
+    IOU_SEND_ADD_DEBIT_CARD: 'send/new/add-debit-card',
+    IOU_SEND_ENABLE_PAYMENTS: 'send/new/enable-payments',
+
+    NEW_TASK: 'new/task',
+    NEW_TASK_ASSIGNEE: 'new/task/assignee',
+    NEW_TASK_SHARE_DESTINATION: 'new/task/share-destination',
+    NEW_TASK_DETAILS: 'new/task/details',
+    NEW_TASK_TITLE: 'new/task/title',
+    NEW_TASK_DESCRIPTION: 'new/task/description',
+
+    TEACHERS_UNITE: 'teachersunite',
+    I_KNOW_A_TEACHER: 'teachersunite/i-know-a-teacher',
+    I_AM_A_TEACHER: 'teachersunite/i-am-a-teacher',
+    INTRO_SCHOOL_PRINCIPAL: 'teachersunite/intro-school-principal',
 
-    // This is a special validation URL that will take the user to /workspace/new after validation. This is used
-    // when linking users from e.com in order to share a session in this app.
-    ENABLE_PAYMENTS: 'enable-payments',
-    WALLET_STATEMENT_WITH_DATE: 'statements/:yearMonth',
-    getWalletStatementWithDateRoute: (yearMonth: string) => `statements/${yearMonth}`,
     WORKSPACE_NEW: 'workspace/new',
-    WORKSPACE_INITIAL: 'workspace/:policyID',
-    WORKSPACE_INVITE: 'workspace/:policyID/invite',
-    WORKSPACE_INVITE_MESSAGE: 'workspace/:policyID/invite-message',
-    WORKSPACE_SETTINGS: 'workspace/:policyID/settings',
-    WORKSPACE_CARD: 'workspace/:policyID/card',
-    WORKSPACE_REIMBURSE: 'workspace/:policyID/reimburse',
-    WORKSPACE_RATE_AND_UNIT: 'workspace/:policyID/rateandunit',
-    WORKSPACE_BILLS: 'workspace/:policyID/bills',
-    WORKSPACE_INVOICES: 'workspace/:policyID/invoices',
-    WORKSPACE_TRAVEL: 'workspace/:policyID/travel',
-    WORKSPACE_MEMBERS: 'workspace/:policyID/members',
     WORKSPACE_NEW_ROOM: 'workspace/new-room',
-    getWorkspaceInitialRoute: (policyID: string) => `workspace/${policyID}`,
-    getWorkspaceInviteRoute: (policyID: string) => `workspace/${policyID}/invite`,
-    getWorkspaceInviteMessageRoute: (policyID: string) => `workspace/${policyID}/invite-message`,
-    getWorkspaceSettingsRoute: (policyID: string) => `workspace/${policyID}/settings`,
-    getWorkspaceCardRoute: (policyID: string) => `workspace/${policyID}/card`,
-    getWorkspaceReimburseRoute: (policyID: string) => `workspace/${policyID}/reimburse`,
-    getWorkspaceRateAndUnitRoute: (policyID: string) => `workspace/${policyID}/rateandunit`,
-    getWorkspaceBillsRoute: (policyID: string) => `workspace/${policyID}/bills`,
-    getWorkspaceInvoicesRoute: (policyID: string) => `workspace/${policyID}/invoices`,
-    getWorkspaceTravelRoute: (policyID: string) => `workspace/${policyID}/travel`,
-    getWorkspaceMembersRoute: (policyID: string) => `workspace/${policyID}/members`,
+    WORKSPACE_INITIAL: {
+        route: 'workspace/:policyID',
+        getRoute: (policyID: string) => `workspace/${policyID}`,
+    },
+    WORKSPACE_INVITE: {
+        route: 'workspace/:policyID/invite',
+        getRoute: (policyID: string) => `workspace/${policyID}/invite`,
+    },
+    WORKSPACE_INVITE_MESSAGE: {
+        route: 'workspace/:policyID/invite-message',
+        getRoute: (policyID: string) => `workspace/${policyID}/invite-message`,
+    },
+    WORKSPACE_SETTINGS: {
+        route: 'workspace/:policyID/settings',
+        getRoute: (policyID: string) => `workspace/${policyID}/settings`,
+    },
+    WORKSPACE_CARD: {
+        route: 'workspace/:policyID/card',
+        getRoute: (policyID: string) => `workspace/${policyID}/card`,
+    },
+    WORKSPACE_REIMBURSE: {
+        route: 'workspace/:policyID/reimburse',
+        getRoute: (policyID: string) => `workspace/${policyID}/reimburse`,
+    },
+    WORKSPACE_RATE_AND_UNIT: {
+        route: 'workspace/:policyID/rateandunit',
+        getRoute: (policyID: string) => `workspace/${policyID}/rateandunit`,
+    },
+    WORKSPACE_BILLS: {
+        route: 'workspace/:policyID/bills',
+        getRoute: (policyID: string) => `workspace/${policyID}/bills`,
+    },
+    WORKSPACE_INVOICES: {
+        route: 'workspace/:policyID/invoices',
+        getRoute: (policyID: string) => `workspace/${policyID}/invoices`,
+    },
+    WORKSPACE_TRAVEL: {
+        route: 'workspace/:policyID/travel',
+        getRoute: (policyID: string) => `workspace/${policyID}/travel`,
+    },
+    WORKSPACE_MEMBERS: {
+        route: 'workspace/:policyID/members',
+        getRoute: (policyID: string) => `workspace/${policyID}/members`,
+    },
 
     // These are some on-off routes that will be removed once they're no longer needed (see GH issues for details)
     SAASTR: 'saastr',
     SBE: 'sbe',
-
-    parseReportRouteParams: (route: string): ParseReportRouteParams => {
-        let parsingRoute = route;
-        if (parsingRoute.at(0) === '/') {
-            // remove the first slash
-            parsingRoute = parsingRoute.slice(1);
-        }
-
-        if (!parsingRoute.startsWith(Url.addTrailingForwardSlash(REPORT))) {
-            return {reportID: '', isSubReportPageRoute: false};
-        }
-
-        const pathSegments = parsingRoute.split('/');
-        return {
-            reportID: pathSegments[1],
-            isSubReportPageRoute: pathSegments.length > 2,
-        };
-    },
-    SIGN_IN_MODAL: 'sign-in-modal',
 } as const;
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 47935e117e99..eb125a43c239 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -12,8 +12,14 @@ export default {
     VALIDATE_LOGIN: 'ValidateLogin',
     CONCIERGE: 'Concierge',
     SETTINGS: {
+        ROOT: 'Settings_Root',
         PREFERENCES: 'Settings_Preferences',
         WORKSPACES: 'Settings_Workspaces',
+        SECURITY: 'Settings_Security',
+        STATUS: 'Settings_Status',
+    },
+    SAVE_THE_WORLD: {
+        ROOT: 'SaveTheWorld_Root',
     },
     SIGN_IN_WITH_APPLE_DESKTOP: 'AppleSignInDesktop',
     SIGN_IN_WITH_GOOGLE_DESKTOP: 'GoogleSignInDesktop',
diff --git a/src/components/AddPaymentMethodMenu.js b/src/components/AddPaymentMethodMenu.js
index 7f1544a758f4..399247a35676 100644
--- a/src/components/AddPaymentMethodMenu.js
+++ b/src/components/AddPaymentMethodMenu.js
@@ -10,7 +10,6 @@ import withWindowDimensions from './withWindowDimensions';
 import Permissions from '../libs/Permissions';
 import PopoverMenu from './PopoverMenu';
 import refPropTypes from './refPropTypes';
-import paypalMeDataPropTypes from './paypalMeDataPropTypes';
 
 const propTypes = {
     /** Should the component be visible? */
@@ -25,12 +24,6 @@ const propTypes = {
         vertical: PropTypes.number,
     }),
 
-    /** Account details for PayPal.Me */
-    payPalMeData: paypalMeDataPropTypes,
-
-    /** Should we show the Paypal option */
-    shouldShowPaypal: PropTypes.bool,
-
     /** List of betas available to current user */
     betas: PropTypes.arrayOf(PropTypes.string),
 
@@ -42,8 +35,6 @@ const propTypes = {
 
 const defaultProps = {
     anchorPosition: {},
-    payPalMeData: {},
-    shouldShowPaypal: true,
     betas: [],
     anchorRef: () => {},
 };
@@ -73,15 +64,6 @@ function AddPaymentMethodMenu(props) {
                           },
                       ]
                     : []),
-                ...(props.shouldShowPaypal && !props.payPalMeData.description
-                    ? [
-                          {
-                              text: props.translate('common.payPalMe'),
-                              icon: Expensicons.PayPal,
-                              onSelected: () => props.onItemSelected(CONST.PAYMENT_METHODS.PAYPAL),
-                          },
-                      ]
-                    : []),
             ]}
             withoutOverlay
         />
@@ -96,9 +78,6 @@ export default compose(
     withWindowDimensions,
     withLocalize,
     withOnyx({
-        payPalMeData: {
-            key: ONYXKEYS.PAYPAL,
-        },
         betas: {
             key: ONYXKEYS.BETAS,
         },
diff --git a/src/components/AddressSearch/index.js b/src/components/AddressSearch/index.js
index 1697dddba805..1b4200572664 100644
--- a/src/components/AddressSearch/index.js
+++ b/src/components/AddressSearch/index.js
@@ -34,7 +34,7 @@ const propTypes = {
     onBlur: PropTypes.func,
 
     /** Error text to display */
-    errorText: PropTypes.string,
+    errorText: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.object]))]),
 
     /** Hint text to display */
     hint: PropTypes.string,
@@ -300,7 +300,7 @@ function AddressSearch(props) {
                     query={query}
                     requestUrl={{
                         useOnPlatform: 'all',
-                        url: ApiUtils.getCommandURL({command: 'Proxy_GooglePlaces&proxyUrl='}),
+                        url: props.network.isOffline ? null : ApiUtils.getCommandURL({command: 'Proxy_GooglePlaces&proxyUrl='}),
                     }}
                     textInputProps={{
                         InputComp: TextInput,
diff --git a/src/components/AnimatedStep/index.js b/src/components/AnimatedStep/index.js
index a8b9b80fcc0e..5b0dc8bc78fa 100644
--- a/src/components/AnimatedStep/index.js
+++ b/src/components/AnimatedStep/index.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import * as Animatable from 'react-native-animatable';
 import CONST from '../../CONST';
 import styles from '../../styles/styles';
+import useNativeDriver from '../../libs/useNativeDriver';
 
 const propTypes = {
     /** Children to wrap in AnimatedStep. */
@@ -47,7 +48,7 @@ function AnimatedStep(props) {
             }}
             duration={CONST.ANIMATED_TRANSITION}
             animation={getAnimationStyle(props.direction)}
-            useNativeDriver
+            useNativeDriver={useNativeDriver}
             style={props.style}
         >
             {props.children}
diff --git a/src/components/ArchivedReportFooter.js b/src/components/ArchivedReportFooter.js
index 70741f352089..71d331b68db0 100644
--- a/src/components/ArchivedReportFooter.js
+++ b/src/components/ArchivedReportFooter.js
@@ -2,6 +2,7 @@ import lodashGet from 'lodash/get';
 import React from 'react';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
+import _ from 'lodash';
 import CONST from '../CONST';
 import Banner from './Banner';
 import withLocalize, {withLocalizePropTypes} from './withLocalize';
@@ -60,15 +61,25 @@ function ArchivedReportFooter(props) {
         oldDisplayName = PersonalDetailsUtils.getDisplayNameOrDefault(props.personalDetails, [oldAccountID, 'displayName']);
     }
 
+    const shouldRenderHTML = archiveReason !== CONST.REPORT.ARCHIVE_REASON.DEFAULT;
+
+    let policyName = ReportUtils.getPolicyName(props.report);
+
+    if (shouldRenderHTML) {
+        oldDisplayName = _.escape(oldDisplayName);
+        displayName = _.escape(displayName);
+        policyName = _.escape(policyName);
+    }
+
     return (
         <Banner
             containerStyles={[styles.archivedReportFooter]}
             text={props.translate(`reportArchiveReasons.${archiveReason}`, {
                 displayName: `<strong>${displayName}</strong>`,
                 oldDisplayName: `<strong>${oldDisplayName}</strong>`,
-                policyName: `<strong>${ReportUtils.getPolicyName(props.report)}</strong>`,
+                policyName: `<strong>${policyName}</strong>`,
             })}
-            shouldRenderHTML={archiveReason !== CONST.REPORT.ARCHIVE_REASON.DEFAULT}
+            shouldRenderHTML={shouldRenderHTML}
             shouldShowIcon
         />
     );
diff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js
index c07a4474a68b..23545de26cfd 100755
--- a/src/components/AttachmentModal.js
+++ b/src/components/AttachmentModal.js
@@ -1,4 +1,4 @@
-import React, {useState, useCallback} from 'react';
+import React, {useState, useCallback, useRef} from 'react';
 import PropTypes from 'prop-types';
 import {View, Animated, Keyboard} from 'react-native';
 import Str from 'expensify-common/lib/str';
@@ -25,7 +25,12 @@ import HeaderGap from './HeaderGap';
 import SafeAreaConsumer from './SafeAreaConsumer';
 import addEncryptedAuthTokenToURL from '../libs/addEncryptedAuthTokenToURL';
 import reportPropTypes from '../pages/reportPropTypes';
-import tryResolveUrlFromApiRoot from '../libs/tryResolveUrlFromApiRoot';
+import * as Expensicons from './Icon/Expensicons';
+import useWindowDimensions from '../hooks/useWindowDimensions';
+import Navigation from '../libs/Navigation/Navigation';
+import ROUTES from '../ROUTES';
+import useNativeDriver from '../libs/useNativeDriver';
+import useNetwork from '../hooks/useNetwork';
 
 /**
  * Modal render prop component that exposes modal launching triggers that can be used
@@ -94,6 +99,7 @@ const defaultProps = {
 };
 
 function AttachmentModal(props) {
+    const onModalHideCallbackRef = useRef(null);
     const [isModalOpen, setIsModalOpen] = useState(props.defaultOpen);
     const [shouldLoadAttachment, setShouldLoadAttachment] = useState(false);
     const [isAttachmentInvalid, setIsAttachmentInvalid] = useState(false);
@@ -106,6 +112,8 @@ function AttachmentModal(props) {
     const [isConfirmButtonDisabled, setIsConfirmButtonDisabled] = useState(false);
     const [confirmButtonFadeAnimation] = useState(new Animated.Value(1));
     const [shouldShowDownloadButton, setShouldShowDownloadButton] = React.useState(true);
+    const {windowWidth} = useWindowDimensions();
+
     const [file, setFile] = useState(
         props.originalFileName
             ? {
@@ -114,6 +122,7 @@ function AttachmentModal(props) {
             : undefined,
     );
     const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
 
     const onCarouselAttachmentChange = props.onCarouselAttachmentChange;
 
@@ -295,7 +304,7 @@ function AttachmentModal(props) {
             Animated.timing(confirmButtonFadeAnimation, {
                 toValue,
                 duration: 100,
-                useNativeDriver: true,
+                useNativeDriver,
             }).start();
         },
         [confirmButtonFadeAnimation],
@@ -331,6 +340,10 @@ function AttachmentModal(props) {
                 }}
                 onModalHide={(e) => {
                     props.onModalHide(e);
+                    if (onModalHideCallbackRef.current) {
+                        onModalHideCallbackRef.current();
+                    }
+
                     setShouldLoadAttachment(false);
                 }}
                 propagateSwipe
@@ -339,19 +352,37 @@ function AttachmentModal(props) {
                 <HeaderWithBackButton
                     title={props.headerTitle || translate(isAttachmentReceipt ? 'common.receipt' : 'common.attachment')}
                     shouldShowBorderBottom
-                    shouldShowDownloadButton={props.allowDownload && shouldShowDownloadButton}
+                    shouldShowDownloadButton={props.allowDownload && shouldShowDownloadButton && !isAttachmentReceipt && !isOffline}
                     onDownloadButtonPress={() => downloadAttachment(source)}
                     shouldShowCloseButton={!props.isSmallScreenWidth}
                     shouldShowBackButton={props.isSmallScreenWidth}
                     onBackButtonPress={closeModal}
                     onCloseButtonPress={closeModal}
+                    shouldShowThreeDotsButton={isAttachmentReceipt}
+                    threeDotsAnchorPosition={styles.threeDotsPopoverOffsetAttachmentModal(windowWidth)}
+                    threeDotsMenuItems={[
+                        {
+                            icon: Expensicons.Camera,
+                            text: props.translate('common.replace'),
+                            onSelected: () => {
+                                onModalHideCallbackRef.current = () => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(props.report.reportID, CONST.EDIT_REQUEST_FIELD.RECEIPT));
+                                closeModal();
+                            },
+                        },
+                        {
+                            icon: Expensicons.Download,
+                            text: props.translate('common.download'),
+                            onSelected: () => downloadAttachment(source),
+                        },
+                    ]}
+                    shouldOverlay
                 />
                 <View style={styles.imageModalImageCenterContainer}>
                     {!_.isEmpty(props.report) ? (
                         <AttachmentCarousel
                             report={props.report}
                             onNavigate={onNavigate}
-                            source={tryResolveUrlFromApiRoot(props.source)}
+                            source={props.source}
                             onClose={closeModal}
                             onToggleKeyboard={updateConfirmButtonVisibility}
                             setDownloadButtonVisibility={setDownloadButtonVisibility}
@@ -366,6 +397,7 @@ function AttachmentModal(props) {
                                 file={file}
                                 onToggleKeyboard={updateConfirmButtonVisibility}
                                 isWorkspaceAvatar={props.isWorkspaceAvatar}
+                                fallbackSource={props.fallbackSource}
                             />
                         )
                     )}
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/AttachmentCarouselCellRenderer.js b/src/components/Attachments/AttachmentCarousel/AttachmentCarouselCellRenderer.js
new file mode 100644
index 000000000000..2c698d5c8a61
--- /dev/null
+++ b/src/components/Attachments/AttachmentCarousel/AttachmentCarouselCellRenderer.js
@@ -0,0 +1,34 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {View, PixelRatio} from 'react-native';
+import useWindowDimensions from '../../../hooks/useWindowDimensions';
+import styles from '../../../styles/styles';
+
+const propTypes = {
+    /** Cell Container styles */
+    style: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
+};
+
+const defaultProps = {
+    style: [],
+};
+
+function AttachmentCarouselCellRenderer(props) {
+    const {windowWidth, isSmallScreenWidth} = useWindowDimensions();
+    const modalStyles = styles.centeredModalStyles(isSmallScreenWidth, true);
+    const style = [props.style, styles.h100, {width: PixelRatio.roundToNearestPixel(windowWidth - (modalStyles.marginHorizontal + modalStyles.borderWidth) * 2)}];
+
+    return (
+        <View
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            style={style}
+        />
+    );
+}
+
+AttachmentCarouselCellRenderer.propTypes = propTypes;
+AttachmentCarouselCellRenderer.defaultProps = defaultProps;
+AttachmentCarouselCellRenderer.displayName = 'AttachmentCarouselCellRenderer';
+
+export default React.memo(AttachmentCarouselCellRenderer);
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/Pager/AttachmentCarouselPage.js b/src/components/Attachments/AttachmentCarousel/Pager/AttachmentCarouselPage.js
index b1a844e4172d..f7da8cfce894 100644
--- a/src/components/Attachments/AttachmentCarousel/Pager/AttachmentCarouselPage.js
+++ b/src/components/Attachments/AttachmentCarousel/Pager/AttachmentCarouselPage.js
@@ -1,5 +1,5 @@
 /* eslint-disable es/no-optional-chaining */
-import React, {useContext, useEffect, useState} from 'react';
+import React, {useContext, useEffect, useRef, useState} from 'react';
 import {ActivityIndicator, PixelRatio, StyleSheet, View} from 'react-native';
 import PropTypes from 'prop-types';
 import Image from '../../../Image';
@@ -41,18 +41,27 @@ function AttachmentCarouselPage({source, isAuthTokenRequired, isActive: initialI
     // to prevent the image transformer from flashing while still rendering
     // Instead, we show the fallback image while the image transformer is loading the image
     useEffect(() => {
-        if (initialIsActive) setTimeout(() => setIsActive(true), 1);
-        else setIsActive(false);
+        if (initialIsActive) {
+            setTimeout(() => setIsActive(true), 1);
+        } else {
+            setIsActive(false);
+        }
     }, [initialIsActive]);
 
     const [initialActivePageLoad, setInitialActivePageLoad] = useState(isActive);
-    const [isImageLoading, setIsImageLoading] = useState(true);
-    const [showFallback, setShowFallback] = useState(isImageLoading);
+    const isImageLoaded = useRef(null);
+    const [isImageLoading, setIsImageLoading] = useState(false);
+    const [isFallbackLoading, setIsFallbackLoading] = useState(false);
+    const [showFallback, setShowFallback] = useState(true);
 
     // We delay hiding the fallback image while image transformer is still rendering
     useEffect(() => {
-        if (isImageLoading) setShowFallback(true);
-        else setTimeout(() => setShowFallback(false), 100);
+        if (isImageLoading || showFallback) {
+            setShowFallback(true);
+        } else {
+            setTimeout(() => setShowFallback(false), 100);
+        }
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [isImageLoading]);
 
     return (
@@ -73,8 +82,14 @@ function AttachmentCarouselPage({source, isAuthTokenRequired, isActive: initialI
                             source={{uri: source}}
                             style={dimensions == null ? undefined : {width: dimensions.imageWidth, height: dimensions.imageHeight}}
                             isAuthTokenRequired={isAuthTokenRequired}
-                            onLoadStart={() => setIsImageLoading(true)}
-                            onLoadEnd={() => setIsImageLoading(false)}
+                            onLoadStart={() => {
+                                setIsImageLoading(true);
+                            }}
+                            onLoadEnd={() => {
+                                setShowFallback(false);
+                                setIsImageLoading(false);
+                                isImageLoaded.current = true;
+                            }}
                             onLoad={(evt) => {
                                 const imageWidth = (evt.nativeEvent?.width || 0) / PixelRatio.get();
                                 const imageHeight = (evt.nativeEvent?.height || 0) / PixelRatio.get();
@@ -100,8 +115,10 @@ function AttachmentCarouselPage({source, isAuthTokenRequired, isActive: initialI
                                 // On the initial render of the active page, the onLoadEnd event is never fired.
                                 // That's why we instead set isImageLoading to false in the onLoad event.
                                 if (initialActivePageLoad) {
-                                    setIsImageLoading(false);
                                     setInitialActivePageLoad(false);
+                                    setIsImageLoading(false);
+                                    setTimeout(() => setShowFallback(false), 100);
+                                    isImageLoaded.current = true;
                                 }
                             }}
                         />
@@ -110,12 +127,24 @@ function AttachmentCarouselPage({source, isAuthTokenRequired, isActive: initialI
             )}
 
             {/* Keep rendering the image without gestures as fallback while ImageTransformer is loading the image */}
-            {(!isActive || showFallback) && (
+            {(showFallback || !isActive) && (
                 <ImageWrapper>
                     <Image
                         source={{uri: source}}
                         isAuthTokenRequired={isAuthTokenRequired}
-                        onLoadStart={() => setIsImageLoading(true)}
+                        onLoadStart={() => {
+                            setIsImageLoading(true);
+                            if (isImageLoaded.current) {
+                                return;
+                            }
+                            setIsFallbackLoading(true);
+                        }}
+                        onLoadEnd={() => {
+                            if (isImageLoaded.current) {
+                                return;
+                            }
+                            setIsFallbackLoading(false);
+                        }}
                         onLoad={(evt) => {
                             const imageWidth = evt.nativeEvent.width;
                             const imageHeight = evt.nativeEvent.height;
@@ -127,7 +156,9 @@ function AttachmentCarouselPage({source, isAuthTokenRequired, isActive: initialI
                             const scaledImageHeight = imageHeight * minImageScale;
 
                             // Don't update the dimensions if they are already set
-                            if (dimensions?.scaledImageWidth === scaledImageWidth && dimensions?.scaledImageHeight === scaledImageHeight) return;
+                            if (dimensions?.scaledImageWidth === scaledImageWidth && dimensions?.scaledImageHeight === scaledImageHeight) {
+                                return;
+                            }
 
                             cachedDimensions.set(source, {
                                 ...dimensions,
@@ -141,7 +172,7 @@ function AttachmentCarouselPage({source, isAuthTokenRequired, isActive: initialI
             )}
 
             {/* Show activity indicator while ImageTransfomer is still loading the image. */}
-            {isActive && isImageLoading && (
+            {isActive && isFallbackLoading && !isImageLoaded.current && (
                 <ActivityIndicator
                     size="large"
                     style={StyleSheet.absoluteFill}
diff --git a/src/components/Attachments/AttachmentCarousel/Pager/ImageTransformer.js b/src/components/Attachments/AttachmentCarousel/Pager/ImageTransformer.js
index 4475df168df2..b1c2864a05f6 100644
--- a/src/components/Attachments/AttachmentCarousel/Pager/ImageTransformer.js
+++ b/src/components/Attachments/AttachmentCarousel/Pager/ImageTransformer.js
@@ -306,7 +306,9 @@ function ImageTransformer({imageWidth, imageHeight, imageScaleX, imageScaleY, sc
             stopAnimation();
         })
         .onFinalize((evt, success) => {
-            if (!success || !onTap) return;
+            if (!success || !onTap) {
+                return;
+            }
 
             runOnJS(onTap)();
         });
@@ -432,7 +434,9 @@ function ImageTransformer({imageWidth, imageHeight, imageScaleX, imageScaleY, sc
     const pinchGesture = Gesture.Pinch()
         .onTouchesDown((evt, state) => {
             // we don't want to activate pinch gesture when we are scrolling pager
-            if (!isScrolling.value) return;
+            if (!isScrolling.value) {
+                return;
+            }
 
             state.fail();
         })
diff --git a/src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.js b/src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.js
index b967d5ab0066..8a623a44709f 100644
--- a/src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.js
+++ b/src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.js
@@ -28,10 +28,12 @@ function extractAttachmentsFromReport(report, reportActions) {
             // By iterating actions in chronological order and prepending each attachment
             // we ensure correct order of attachments even across actions with multiple attachments.
             attachments.unshift({
+                reportActionID: attribs['data-id'],
                 source: tryResolveUrlFromApiRoot(expensifySource || attribs.src),
                 isAuthTokenRequired: Boolean(expensifySource),
                 file: {name: attribs[CONST.ATTACHMENT_ORIGINAL_FILENAME_ATTRIBUTE]},
                 isReceipt: false,
+                hasBeenFlagged: attribs['data-flagged'] === 'true',
             });
         },
     });
@@ -57,12 +59,16 @@ function extractAttachmentsFromReport(report, reportActions) {
                     isAuthTokenRequired: true,
                     file: {name: transaction.filename},
                     isReceipt: true,
+                    transactionID,
                 });
                 return;
             }
         }
 
-        htmlParser.write(_.get(action, ['message', 0, 'html']));
+        const decision = _.get(action, ['message', 0, 'moderationDecision', 'decision'], '');
+        const hasBeenFlagged = decision === CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE || decision === CONST.MODERATION.MODERATOR_DECISION_HIDDEN;
+        const html = _.get(action, ['message', 0, 'html'], '').replace('/>', `data-flagged="${hasBeenFlagged}" data-id="${action.reportActionID}"/>`);
+        htmlParser.write(html);
     });
     htmlParser.end();
 
diff --git a/src/components/Attachments/AttachmentCarousel/index.js b/src/components/Attachments/AttachmentCarousel/index.js
index 53c2c840d95d..00b603cdd7d9 100644
--- a/src/components/Attachments/AttachmentCarousel/index.js
+++ b/src/components/Attachments/AttachmentCarousel/index.js
@@ -2,10 +2,9 @@ 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 AttachmentCarouselCellRenderer from './AttachmentCarouselCellRenderer';
 import CarouselActions from './CarouselActions';
-import AttachmentView from '../AttachmentView';
 import withWindowDimensions from '../../withWindowDimensions';
 import CarouselButtons from './CarouselButtons';
 import extractAttachmentsFromReport from './extractAttachmentsFromReport';
@@ -14,13 +13,14 @@ import ONYXKEYS from '../../../ONYXKEYS';
 import withLocalize from '../../withLocalize';
 import compose from '../../../libs/compose';
 import useCarouselArrows from './useCarouselArrows';
-import useWindowDimensions from '../../../hooks/useWindowDimensions';
+import CarouselItem from './CarouselItem';
 import Navigation from '../../../libs/Navigation/Navigation';
 import BlockingView from '../../BlockingViews/BlockingView';
 import * as Illustrations from '../../Icon/Illustrations';
 import variables from '../../../styles/variables';
+import * as DeviceCapabilities from '../../../libs/DeviceCapabilities';
+import * as ReportActionsUtils from '../../../libs/ReportActionsUtils';
 
-const canUseTouchScreen = DeviceCapabilities.canUseTouchScreen();
 const viewabilityConfig = {
     // To facilitate paging through the attachments, we want to consider an item "viewable" when it is
     // more than 95% visible. When that happens we update the page index in the state.
@@ -30,7 +30,7 @@ const viewabilityConfig = {
 function AttachmentCarousel({report, reportActions, source, onNavigate, setDownloadButtonVisibility, translate}) {
     const scrollRef = useRef(null);
 
-    const {windowWidth, isSmallScreenWidth} = useWindowDimensions();
+    const canUseTouchScreen = DeviceCapabilities.canUseTouchScreen();
 
     const [containerWidth, setContainerWidth] = useState(0);
     const [page, setPage] = useState(0);
@@ -38,13 +38,25 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, setDownl
     const [activeSource, setActiveSource] = useState(source);
     const [shouldShowArrows, setShouldShowArrows, autoHideArrows, cancelAutoHideArrows] = useCarouselArrows();
 
+    const compareImage = useCallback(
+        (attachment) => {
+            if (attachment.isReceipt) {
+                const action = ReportActionsUtils.getParentReportAction(report);
+                const transactionID = _.get(action, ['originalMessage', 'IOUTransactionID']);
+                return attachment.transactionID === transactionID;
+            }
+            return attachment.source === source;
+        },
+        [source, report],
+    );
+
     useEffect(() => {
         const attachmentsFromReport = extractAttachmentsFromReport(report, reportActions);
 
-        const initialPage = _.findIndex(attachmentsFromReport, (a) => a.source === source);
+        const initialPage = _.findIndex(attachmentsFromReport, compareImage);
 
         // Dismiss the modal when deleting an attachment during its display in preview.
-        if (initialPage === -1 && _.find(attachments, (a) => a.source === source)) {
+        if (initialPage === -1 && _.find(attachments, compareImage)) {
             Navigation.dismissModal();
         } else {
             setPage(initialPage);
@@ -54,10 +66,12 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, setDownl
             setDownloadButtonVisibility(initialPage !== -1);
 
             // Update the parent modal's state with the source and name from the mapped attachments
-            if (!_.isUndefined(attachmentsFromReport[initialPage])) onNavigate(attachmentsFromReport[initialPage]);
+            if (!_.isUndefined(attachmentsFromReport[initialPage])) {
+                onNavigate(attachmentsFromReport[initialPage]);
+            }
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [report, reportActions, source]);
+    }, [reportActions, compareImage]);
 
     /**
      * Updates the page state when the user navigates between attachments
@@ -99,7 +113,7 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, setDownl
 
             scrollRef.current.scrollToIndex({index: nextIndex, animated: canUseTouchScreen});
         },
-        [attachments, page],
+        [attachments, canUseTouchScreen, page],
     );
 
     /**
@@ -117,50 +131,26 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, setDownl
         [containerWidth],
     );
 
-    /**
-     * Defines how a container for a single attachment should be rendered
-     * @param {Object} cellRendererProps
-     * @returns {JSX.Element}
-     */
-    const renderCell = useCallback(
-        (cellProps) => {
-            // Use window width instead of layout width to address the issue in https://github.com/Expensify/App/issues/17760
-            // considering horizontal margin and border width in centered modal
-            const modalStyles = styles.centeredModalStyles(isSmallScreenWidth, true);
-            const style = [cellProps.style, styles.h100, {width: PixelRatio.roundToNearestPixel(windowWidth - (modalStyles.marginHorizontal + modalStyles.borderWidth) * 2)}];
-
-            return (
-                <View
-                    // eslint-disable-next-line react/jsx-props-no-spreading
-                    {...cellProps}
-                    style={style}
-                />
-            );
-        },
-        [isSmallScreenWidth, windowWidth],
-    );
-
     /**
      * 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 (
@@ -212,7 +202,7 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, setDownl
                             windowSize={5}
                             maxToRenderPerBatch={3}
                             data={attachments}
-                            CellRendererComponent={renderCell}
+                            CellRendererComponent={AttachmentCarouselCellRenderer}
                             renderItem={renderItem}
                             getItemLayout={getItemLayout}
                             keyExtractor={(item) => item.source}
diff --git a/src/components/Attachments/AttachmentCarousel/index.native.js b/src/components/Attachments/AttachmentCarousel/index.native.js
index 4162cfae88e9..bd12020341be 100644
--- a/src/components/Attachments/AttachmentCarousel/index.native.js
+++ b/src/components/Attachments/AttachmentCarousel/index.native.js
@@ -5,17 +5,18 @@ import _ from 'underscore';
 import AttachmentCarouselPager from './Pager';
 import styles from '../../../styles/styles';
 import CarouselButtons from './CarouselButtons';
-import AttachmentView from '../AttachmentView';
 import ONYXKEYS from '../../../ONYXKEYS';
 import {propTypes, defaultProps} from './attachmentCarouselPropTypes';
 import extractAttachmentsFromReport from './extractAttachmentsFromReport';
 import useCarouselArrows from './useCarouselArrows';
+import CarouselItem from './CarouselItem';
 import Navigation from '../../../libs/Navigation/Navigation';
 import BlockingView from '../../BlockingViews/BlockingView';
 import * as Illustrations from '../../Icon/Illustrations';
 import variables from '../../../styles/variables';
 import compose from '../../../libs/compose';
 import withLocalize from '../../withLocalize';
+import * as ReportActionsUtils from '../../../libs/ReportActionsUtils';
 
 function AttachmentCarousel({report, reportActions, source, onNavigate, onClose, setDownloadButtonVisibility, translate}) {
     const pagerRef = useRef(null);
@@ -27,13 +28,25 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, onClose,
     const [isPinchGestureRunning, setIsPinchGestureRunning] = useState(true);
     const [shouldShowArrows, setShouldShowArrows, autoHideArrows, cancelAutoHideArrows] = useCarouselArrows();
 
+    const compareImage = useCallback(
+        (attachment) => {
+            if (attachment.isReceipt) {
+                const action = ReportActionsUtils.getParentReportAction(report);
+                const transactionID = _.get(action, ['originalMessage', 'IOUTransactionID']);
+                return attachment.transactionID === transactionID;
+            }
+            return attachment.source === source;
+        },
+        [source, report],
+    );
+
     useEffect(() => {
         const attachmentsFromReport = extractAttachmentsFromReport(report, reportActions);
 
-        const initialPage = _.findIndex(attachmentsFromReport, (a) => a.source === source);
+        const initialPage = _.findIndex(attachmentsFromReport, compareImage);
 
         // Dismiss the modal when deleting an attachment during its display in preview.
-        if (initialPage === -1 && _.find(attachments, (a) => a.source === source)) {
+        if (initialPage === -1 && _.find(attachments, compareImage)) {
             Navigation.dismissModal();
         } else {
             setPage(initialPage);
@@ -43,10 +56,12 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, onClose,
             setDownloadButtonVisibility(initialPage !== -1);
 
             // Update the parent modal's state with the source and name from the mapped attachments
-            if (!_.isUndefined(attachmentsFromReport[initialPage])) onNavigate(attachmentsFromReport[initialPage]);
+            if (!_.isUndefined(attachmentsFromReport[initialPage])) {
+                onNavigate(attachmentsFromReport[initialPage]);
+            }
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [report, reportActions, source]);
+    }, [reportActions, compareImage]);
 
     /**
      * Updates the page state when the user navigates between attachments
@@ -85,17 +100,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)}
             />
         ),
@@ -138,7 +150,9 @@ function AttachmentCarousel({report, reportActions, source, onNavigate, onClose,
                             onPageSelected={({nativeEvent: {position: newPage}}) => updatePage(newPage)}
                             onPinchGestureChange={(newIsPinchGestureRunning) => {
                                 setIsPinchGestureRunning(newIsPinchGestureRunning);
-                                if (!newIsPinchGestureRunning && !shouldShowArrows) setShouldShowArrows(true);
+                                if (!newIsPinchGestureRunning && !shouldShowArrows) {
+                                    setShouldShowArrows(true);
+                                }
                             }}
                             onSwipeDown={onClose}
                             containerWidth={containerDimensions.width}
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/Attachments/AttachmentView/AttachmentViewImage/index.js b/src/components/Attachments/AttachmentView/AttachmentViewImage/index.js
index 7de4417a4efc..48ac954ced7f 100755
--- a/src/components/Attachments/AttachmentView/AttachmentViewImage/index.js
+++ b/src/components/Attachments/AttachmentView/AttachmentViewImage/index.js
@@ -12,13 +12,14 @@ const propTypes = {
     ...withLocalizePropTypes,
 };
 
-function AttachmentViewImage({source, file, isAuthTokenRequired, loadComplete, onPress, isImage, onScaleChanged, translate}) {
+function AttachmentViewImage({source, file, isAuthTokenRequired, loadComplete, onPress, isImage, onScaleChanged, translate, onError}) {
     const children = (
         <ImageView
             onScaleChanged={onScaleChanged}
             url={source}
             fileName={file.name}
             isAuthTokenRequired={isImage && isAuthTokenRequired}
+            onError={onError}
         />
     );
     return onPress ? (
diff --git a/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.native.js b/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.native.js
index 0767b2b68985..fdf151c4d5d0 100644
--- a/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.native.js
+++ b/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.native.js
@@ -25,7 +25,9 @@ function AttachmentViewPdf({file, encryptedSourceUrl, isFocused, isUsedInCarouse
 
                 attachmentCarouselPagerContext.onPinchGestureChange(!shouldPagerScroll);
 
-                if (attachmentCarouselPagerContext.shouldPagerScroll.value === shouldPagerScroll) return;
+                if (attachmentCarouselPagerContext.shouldPagerScroll.value === shouldPagerScroll) {
+                    return;
+                }
 
                 attachmentCarouselPagerContext.shouldPagerScroll.value = shouldPagerScroll;
             }
diff --git a/src/components/Attachments/AttachmentView/index.js b/src/components/Attachments/AttachmentView/index.js
index 47353d915060..1fc579977c9d 100755
--- a/src/components/Attachments/AttachmentView/index.js
+++ b/src/components/Attachments/AttachmentView/index.js
@@ -17,6 +17,7 @@ import AttachmentViewPdf from './AttachmentViewPdf';
 import addEncryptedAuthTokenToURL from '../../../libs/addEncryptedAuthTokenToURL';
 import * as StyleUtils from '../../../styles/StyleUtils';
 import {attachmentViewPropTypes, attachmentViewDefaultProps} from './propTypes';
+import useNetwork from '../../../hooks/useNetwork';
 
 const propTypes = {
     ...attachmentViewPropTypes,
@@ -62,9 +63,14 @@ function AttachmentView({
     translate,
     isFocused,
     isWorkspaceAvatar,
+    fallbackSource,
 }) {
     const [loadComplete, setLoadComplete] = useState(false);
 
+    const [imageError, setImageError] = useState(false);
+
+    useNetwork({onReconnect: () => setImageError(false)});
+
     // Handles case where source is a component (ex: SVG)
     if (_.isFunction(source)) {
         let iconFillColor = '';
@@ -113,7 +119,7 @@ function AttachmentView({
     if (isImage || (file && Str.isImage(file.name))) {
         return (
             <AttachmentViewImage
-                source={source}
+                source={imageError ? fallbackSource : source}
                 file={file}
                 isAuthTokenRequired={isAuthTokenRequired}
                 isUsedInCarousel={isUsedInCarousel}
@@ -122,6 +128,9 @@ function AttachmentView({
                 isImage={isImage}
                 onPress={onPress}
                 onScaleChanged={onScaleChanged}
+                onError={() => {
+                    setImageError(true);
+                }}
             />
         );
     }
diff --git a/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.js b/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.js
index b4710f1f343e..40e08d876907 100644
--- a/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.js
+++ b/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.js
@@ -70,7 +70,7 @@ function BaseAutoCompleteSuggestions(props) {
     });
 
     const innerHeight = CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTION_ROW_HEIGHT * props.suggestions.length;
-    const animatedStyles = useAnimatedStyle(() => StyleUtils.getAutoCompleteSuggestionContainerStyle(rowHeight.value, props.shouldIncludeReportRecipientLocalTimeHeight));
+    const animatedStyles = useAnimatedStyle(() => StyleUtils.getAutoCompleteSuggestionContainerStyle(rowHeight.value));
 
     useEffect(() => {
         rowHeight.value = withTiming(measureHeightOfSuggestionRows(props.suggestions.length, props.isSuggestionPickerLarge), {
diff --git a/src/components/AutoCompleteSuggestions/autoCompleteSuggestionsPropTypes.js b/src/components/AutoCompleteSuggestions/autoCompleteSuggestionsPropTypes.js
index 16040991a3d8..8c6dca1902c5 100644
--- a/src/components/AutoCompleteSuggestions/autoCompleteSuggestionsPropTypes.js
+++ b/src/components/AutoCompleteSuggestions/autoCompleteSuggestionsPropTypes.js
@@ -22,9 +22,6 @@ const propTypes = {
      * When this value is false, the suggester will have a height of 2.5 items. When this value is true, the height can be up to 5 items.  */
     isSuggestionPickerLarge: PropTypes.bool.isRequired,
 
-    /** Show that we should include ReportRecipientLocalTime view height */
-    shouldIncludeReportRecipientLocalTimeHeight: PropTypes.bool.isRequired,
-
     /** create accessibility label for each item */
     accessibilityLabelExtractor: PropTypes.func.isRequired,
 
diff --git a/src/components/AutoCompleteSuggestions/index.js b/src/components/AutoCompleteSuggestions/index.js
index b37fcd7181d9..9234d04f4507 100644
--- a/src/components/AutoCompleteSuggestions/index.js
+++ b/src/components/AutoCompleteSuggestions/index.js
@@ -14,7 +14,7 @@ import useWindowDimensions from '../../hooks/useWindowDimensions';
  * On the native platform, tapping on auto-complete suggestions will not blur the main input.
  */
 
-function AutoCompleteSuggestions({parentContainerRef, ...props}) {
+function AutoCompleteSuggestions({measureParentContainer, ...props}) {
     const containerRef = React.useRef(null);
     const {windowHeight, windowWidth} = useWindowDimensions();
     const [{width, left, bottom}, setContainerState] = React.useState({
@@ -37,11 +37,11 @@ function AutoCompleteSuggestions({parentContainerRef, ...props}) {
     }, []);
 
     React.useEffect(() => {
-        if (!parentContainerRef || !parentContainerRef.current) {
+        if (!measureParentContainer) {
             return;
         }
-        parentContainerRef.current.measureInWindow((x, y, w) => setContainerState({left: x, bottom: windowHeight - y, width: w}));
-    }, [parentContainerRef, windowHeight, windowWidth]);
+        measureParentContainer((x, y, w) => setContainerState({left: x, bottom: windowHeight - y, width: w}));
+    }, [measureParentContainer, windowHeight, windowWidth]);
 
     const componentToRender = (
         <BaseAutoCompleteSuggestions
@@ -51,11 +51,10 @@ function AutoCompleteSuggestions({parentContainerRef, ...props}) {
         />
     );
 
-    if (!width) {
-        return componentToRender;
-    }
-
-    return ReactDOM.createPortal(<View style={StyleUtils.getBaseAutoCompleteSuggestionContainerStyle({left, width, bottom})}>{componentToRender}</View>, document.querySelector('body'));
+    return (
+        Boolean(width) &&
+        ReactDOM.createPortal(<View style={StyleUtils.getBaseAutoCompleteSuggestionContainerStyle({left, width, bottom})}>{componentToRender}</View>, document.querySelector('body'))
+    );
 }
 
 AutoCompleteSuggestions.propTypes = propTypes;
diff --git a/src/components/AutoCompleteSuggestions/index.native.js b/src/components/AutoCompleteSuggestions/index.native.js
index 514cec6cd844..f5ff4636f395 100644
--- a/src/components/AutoCompleteSuggestions/index.native.js
+++ b/src/components/AutoCompleteSuggestions/index.native.js
@@ -1,10 +1,15 @@
 import React from 'react';
+import {Portal} from '@gorhom/portal';
 import BaseAutoCompleteSuggestions from './BaseAutoCompleteSuggestions';
 import {propTypes} from './autoCompleteSuggestionsPropTypes';
 
-function AutoCompleteSuggestions({parentContainerRef, ...props}) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    return <BaseAutoCompleteSuggestions {...props} />;
+function AutoCompleteSuggestions({measureParentContainer, ...props}) {
+    return (
+        <Portal hostName="suggestions">
+            {/* eslint-disable-next-line react/jsx-props-no-spreading */}
+            <BaseAutoCompleteSuggestions {...props} />
+        </Portal>
+    );
 }
 
 AutoCompleteSuggestions.propTypes = propTypes;
diff --git a/src/components/Avatar.js b/src/components/Avatar.js
index b96e60dd56d1..4f0eb60eb2e0 100644
--- a/src/components/Avatar.js
+++ b/src/components/Avatar.js
@@ -1,4 +1,4 @@
-import React, {useState} from 'react';
+import React, {useEffect, useState} from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
@@ -40,7 +40,7 @@ const propTypes = {
     /** A fallback avatar icon to display when there is an error on loading avatar from remote URL.
      * If the avatar is type === workspace, this fallback icon will be ignored and decided based on the name prop.
      */
-    fallbackIcon: PropTypes.func,
+    fallbackIcon: PropTypes.oneOfType([PropTypes.func, PropTypes.string]),
 
     /** Denotes whether it is an avatar or a workspace avatar */
     type: PropTypes.oneOf([CONST.ICON_TYPE_AVATAR, CONST.ICON_TYPE_WORKSPACE]),
@@ -66,6 +66,10 @@ function Avatar(props) {
 
     useNetwork({onReconnect: () => setImageError(false)});
 
+    useEffect(() => {
+        setImageError(false);
+    }, [props.source]);
+
     if (!props.source) {
         return null;
     }
@@ -81,14 +85,14 @@ function Avatar(props) {
     const iconStyle = props.imageStyles && props.imageStyles.length ? [StyleUtils.getAvatarStyle(props.size), styles.bgTransparent, ...props.imageStyles] : undefined;
 
     const iconFillColor = isWorkspace ? StyleUtils.getDefaultWorkspaceAvatarColor(props.name).fill : props.fill;
-    const fallbackAvatar = isWorkspace ? ReportUtils.getDefaultWorkspaceAvatar(props.name) : props.fallbackIcon;
+    const fallbackAvatar = isWorkspace ? ReportUtils.getDefaultWorkspaceAvatar(props.name) : props.fallbackIcon || Expensicons.FallbackAvatar;
 
     return (
         <View
             pointerEvents="none"
             style={props.containerStyles}
         >
-            {_.isFunction(props.source) || imageError ? (
+            {_.isFunction(props.source) || (imageError && _.isFunction(fallbackAvatar)) ? (
                 <View style={iconStyle}>
                     <Icon
                         src={imageError ? fallbackAvatar : props.source}
@@ -106,7 +110,7 @@ function Avatar(props) {
             ) : (
                 <View style={[iconStyle, StyleUtils.getAvatarBorderStyle(props.size, props.type), ...props.iconAdditionalStyles]}>
                     <Image
-                        source={{uri: props.source}}
+                        source={{uri: imageError ? fallbackAvatar : props.source}}
                         style={imageStyle}
                         onError={() => setImageError(true)}
                     />
diff --git a/src/components/AvatarCropModal/AvatarCropModal.js b/src/components/AvatarCropModal/AvatarCropModal.js
index baa958106f84..10e8a76f756d 100644
--- a/src/components/AvatarCropModal/AvatarCropModal.js
+++ b/src/components/AvatarCropModal/AvatarCropModal.js
@@ -366,6 +366,7 @@ function AvatarCropModal(props) {
                 style={[styles.pb0]}
                 includePaddingTop={false}
                 includeSafeAreaPaddingBottom={false}
+                testID={AvatarCropModal.displayName}
             >
                 {props.isSmallScreenWidth && <HeaderGap />}
                 <HeaderWithBackButton
diff --git a/src/components/AvatarWithDisplayName.js b/src/components/AvatarWithDisplayName.js
index e82dbe05a6d0..81eace444de4 100644
--- a/src/components/AvatarWithDisplayName.js
+++ b/src/components/AvatarWithDisplayName.js
@@ -57,12 +57,12 @@ const defaultProps = {
 
 const showActorDetails = (report) => {
     if (ReportUtils.isExpenseReport(report)) {
-        Navigation.navigate(ROUTES.getProfileRoute(report.ownerAccountID));
+        Navigation.navigate(ROUTES.PROFILE.getRoute(report.ownerAccountID));
         return;
     }
 
     if (ReportUtils.isIOUReport(report)) {
-        Navigation.navigate(ROUTES.getReportParticipantsRoute(report.reportID));
+        Navigation.navigate(ROUTES.REPORT_PARTICIPANTS.getRoute(report.reportID));
         return;
     }
 
@@ -71,13 +71,13 @@ const showActorDetails = (report) => {
         const actorAccountID = lodashGet(parentReportAction, 'actorAccountID', -1);
         // in an ideal situation account ID won't be 0
         if (actorAccountID > 0) {
-            Navigation.navigate(ROUTES.getProfileRoute(actorAccountID));
+            Navigation.navigate(ROUTES.PROFILE.getRoute(actorAccountID));
             return;
         }
     }
 
     // report detail route is added as fallback but based on the current implementation this route won't be executed
-    Navigation.navigate(ROUTES.getReportDetailsRoute(report.reportID));
+    Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report.reportID));
 };
 
 function AvatarWithDisplayName(props) {
@@ -85,12 +85,13 @@ function AvatarWithDisplayName(props) {
     const subtitle = ReportUtils.getChatRoomSubtitle(props.report);
     const parentNavigationSubtitleData = ReportUtils.getParentNavigationSubtitle(props.report);
     const isMoneyRequestOrReport = ReportUtils.isMoneyRequestReport(props.report) || ReportUtils.isMoneyRequest(props.report);
-    const icons = ReportUtils.getIcons(props.report, props.personalDetails, props.policy, true);
+    const icons = ReportUtils.getIcons(props.report, props.personalDetails, props.policy);
     const ownerPersonalDetails = OptionsListUtils.getPersonalDetailsForAccountIDs([props.report.ownerAccountID], props.personalDetails);
     const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(_.values(ownerPersonalDetails), false);
     const shouldShowSubscriptAvatar = ReportUtils.shouldReportShowSubscript(props.report);
     const isExpenseRequest = ReportUtils.isExpenseRequest(props.report);
     const defaultSubscriptSize = isExpenseRequest ? CONST.AVATAR_SIZE.SMALL_NORMAL : props.size;
+    const avatarBorderColor = props.isAnonymous ? themeColors.highlightBG : themeColors.componentBG;
 
     return (
         <View style={[styles.appContentHeaderTitle, styles.flex1]}>
@@ -103,7 +104,7 @@ function AvatarWithDisplayName(props) {
                     >
                         {shouldShowSubscriptAvatar ? (
                             <SubscriptAvatar
-                                backgroundColor={themeColors.highlightBG}
+                                backgroundColor={avatarBorderColor}
                                 mainAvatar={icons[0]}
                                 secondaryAvatar={icons[1]}
                                 size={defaultSubscriptSize}
@@ -112,7 +113,7 @@ function AvatarWithDisplayName(props) {
                             <MultipleAvatars
                                 icons={icons}
                                 size={props.size}
-                                secondAvatarStyle={[StyleUtils.getBackgroundAndBorderStyle(themeColors.highlightBG)]}
+                                secondAvatarStyle={[StyleUtils.getBackgroundAndBorderStyle(avatarBorderColor)]}
                             />
                         )}
                     </PressableWithoutFeedback>
diff --git a/src/components/AvatarWithImagePicker.js b/src/components/AvatarWithImagePicker.js
index aa50d6db574b..a44d1841bbb6 100644
--- a/src/components/AvatarWithImagePicker.js
+++ b/src/components/AvatarWithImagePicker.js
@@ -21,8 +21,11 @@ import stylePropTypes from '../styles/stylePropTypes';
 import * as FileUtils from '../libs/fileDownload/FileUtils';
 import getImageResolution from '../libs/fileDownload/getImageResolution';
 import PressableWithoutFeedback from './Pressable/PressableWithoutFeedback';
+import AttachmentModal from './AttachmentModal';
 import DotIndicatorMessage from './DotIndicatorMessage';
 import * as Browser from '../libs/Browser';
+import withNavigationFocus, {withNavigationFocusPropTypes} from './withNavigationFocus';
+import compose from '../libs/compose';
 
 const propTypes = {
     /** Avatar source to display */
@@ -58,7 +61,7 @@ const propTypes = {
     size: PropTypes.oneOf([CONST.AVATAR_SIZE.LARGE, CONST.AVATAR_SIZE.DEFAULT]),
 
     /** A fallback avatar icon to display when there is an error on loading avatar from remote URL. */
-    fallbackIcon: PropTypes.func,
+    fallbackIcon: PropTypes.oneOfType([PropTypes.func, PropTypes.string]),
 
     /** Denotes whether it is an avatar or a workspace avatar */
     type: PropTypes.oneOf([CONST.ICON_TYPE_AVATAR, CONST.ICON_TYPE_WORKSPACE]),
@@ -79,7 +82,17 @@ const propTypes = {
     // eslint-disable-next-line react/forbid-prop-types
     errors: PropTypes.object,
 
+    /** Title for avatar preview modal */
+    headerTitle: PropTypes.string,
+
+    /** Avatar source for avatar preview modal */
+    previewSource: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
+
+    /** File name of the avatar */
+    originalFileName: PropTypes.string,
+
     ...withLocalizePropTypes,
+    ...withNavigationFocusPropTypes,
 };
 
 const defaultProps = {
@@ -98,6 +111,9 @@ const defaultProps = {
     onErrorClose: () => {},
     pendingAction: null,
     errors: null,
+    headerTitle: '',
+    previewSource: '',
+    originalFileName: '',
 };
 
 class AvatarWithImagePicker extends React.Component {
@@ -129,6 +145,9 @@ class AvatarWithImagePicker extends React.Component {
     }
 
     componentDidUpdate(prevProps) {
+        if (!prevProps.isFocused && this.props.isFocused) {
+            this.setError(null, {});
+        }
         if (!prevProps.isUploading && this.props.isUploading) {
             this.animation.start();
         } else if (prevProps.isUploading && !this.props.isUploading) {
@@ -273,58 +292,73 @@ class AvatarWithImagePicker extends React.Component {
                             </PressableWithoutFeedback>
                         </Tooltip>
                     </OfflineWithFeedback>
-                    <AttachmentPicker type={CONST.ATTACHMENT_PICKER_TYPE.IMAGE}>
-                        {({openPicker}) => {
-                            const menuItems = [
-                                {
-                                    icon: Expensicons.Upload,
-                                    text: this.props.translate('avatarWithImagePicker.uploadPhoto'),
-                                    onSelected: () => {
-                                        if (Browser.isSafari()) {
-                                            return;
-                                        }
-                                        openPicker({
-                                            onPicked: this.showAvatarCropModal,
+                    <AttachmentModal
+                        headerTitle={this.props.headerTitle}
+                        source={this.props.previewSource}
+                        originalFileName={this.props.originalFileName}
+                        fallbackSource={this.props.fallbackIcon}
+                    >
+                        {({show}) => (
+                            <AttachmentPicker type={CONST.ATTACHMENT_PICKER_TYPE.IMAGE}>
+                                {({openPicker}) => {
+                                    const menuItems = [
+                                        {
+                                            icon: Expensicons.Upload,
+                                            text: this.props.translate('avatarWithImagePicker.uploadPhoto'),
+                                            onSelected: () => {
+                                                if (Browser.isSafari()) {
+                                                    return;
+                                                }
+                                                openPicker({
+                                                    onPicked: this.showAvatarCropModal,
+                                                });
+                                            },
+                                        },
+                                    ];
+
+                                    // If current avatar isn't a default avatar, allow Remove Photo option
+                                    if (!this.props.isUsingDefaultAvatar) {
+                                        menuItems.push({
+                                            icon: Expensicons.Trashcan,
+                                            text: this.props.translate('avatarWithImagePicker.removePhoto'),
+                                            onSelected: () => {
+                                                this.setError(null, {});
+                                                this.props.onImageRemoved();
+                                            },
+                                        });
+
+                                        menuItems.push({
+                                            icon: Expensicons.Eye,
+                                            text: this.props.translate('avatarWithImagePicker.viewPhoto'),
+                                            onSelected: () => show(),
                                         });
-                                    },
-                                },
-                            ];
-
-                            // If current avatar isn't a default avatar, allow Remove Photo option
-                            if (!this.props.isUsingDefaultAvatar) {
-                                menuItems.push({
-                                    icon: Expensicons.Trashcan,
-                                    text: this.props.translate('avatarWithImagePicker.removePhoto'),
-                                    onSelected: () => {
-                                        this.setError(null, {});
-                                        this.props.onImageRemoved();
-                                    },
-                                });
-                            }
-                            return (
-                                <PopoverMenu
-                                    isVisible={this.state.isMenuVisible}
-                                    onClose={() => this.setState({isMenuVisible: false})}
-                                    onItemSelected={(item, index) => {
-                                        this.setState({isMenuVisible: false});
-                                        // In order for the file picker to open dynamically, the click
-                                        // function must be called from within a event handler that was initiated
-                                        // by the user on Safari.
-                                        if (index === 0 && Browser.isSafari()) {
-                                            openPicker({
-                                                onPicked: this.showAvatarCropModal,
-                                            });
-                                        }
-                                    }}
-                                    menuItems={menuItems}
-                                    anchorPosition={this.props.anchorPosition}
-                                    withoutOverlay
-                                    anchorRef={this.anchorRef}
-                                    anchorAlignment={this.props.anchorAlignment}
-                                />
-                            );
-                        }}
-                    </AttachmentPicker>
+                                    }
+                                    return (
+                                        <PopoverMenu
+                                            isVisible={this.state.isMenuVisible}
+                                            onClose={() => this.setState({isMenuVisible: false})}
+                                            onItemSelected={(item, index) => {
+                                                this.setState({isMenuVisible: false});
+                                                // In order for the file picker to open dynamically, the click
+                                                // function must be called from within a event handler that was initiated
+                                                // by the user on Safari.
+                                                if (index === 0 && Browser.isSafari()) {
+                                                    openPicker({
+                                                        onPicked: this.showAvatarCropModal,
+                                                    });
+                                                }
+                                            }}
+                                            menuItems={menuItems}
+                                            anchorPosition={this.props.anchorPosition}
+                                            withoutOverlay
+                                            anchorRef={this.anchorRef}
+                                            anchorAlignment={this.props.anchorAlignment}
+                                        />
+                                    );
+                                }}
+                            </AttachmentPicker>
+                        )}
+                    </AttachmentModal>
                 </View>
                 {this.state.validationError && (
                     <DotIndicatorMessage
@@ -350,4 +384,4 @@ class AvatarWithImagePicker extends React.Component {
 AvatarWithImagePicker.propTypes = propTypes;
 AvatarWithImagePicker.defaultProps = defaultProps;
 
-export default withLocalize(AvatarWithImagePicker);
+export default compose(withLocalize, withNavigationFocus)(AvatarWithImagePicker);
diff --git a/src/components/AvatarWithIndicator.js b/src/components/AvatarWithIndicator.js
index b59f67a45b7b..5e7b8d1ee632 100644
--- a/src/components/AvatarWithIndicator.js
+++ b/src/components/AvatarWithIndicator.js
@@ -6,6 +6,7 @@ import styles from '../styles/styles';
 import Tooltip from './Tooltip';
 import * as UserUtils from '../libs/UserUtils';
 import Indicator from './Indicator';
+import * as Expensicons from './Icon/Expensicons';
 
 const propTypes = {
     /** URL for the avatar */
@@ -13,17 +14,24 @@ const propTypes = {
 
     /** To show a tooltip on hover */
     tooltipText: PropTypes.string,
+
+    /** A fallback avatar icon to display when there is an error on loading avatar from remote URL. */
+    fallbackIcon: PropTypes.oneOfType([PropTypes.func, PropTypes.string]),
 };
 
 const defaultProps = {
     tooltipText: '',
+    fallbackIcon: Expensicons.FallbackAvatar,
 };
 
 function AvatarWithIndicator(props) {
     return (
         <Tooltip text={props.tooltipText}>
             <View style={[styles.sidebarAvatar]}>
-                <Avatar source={UserUtils.getSmallSizeAvatar(props.source)} />
+                <Avatar
+                    source={UserUtils.getSmallSizeAvatar(props.source)}
+                    fallbackIcon={props.fallbackIcon}
+                />
                 <Indicator />
             </View>
         </Tooltip>
diff --git a/src/components/BaseMiniContextMenuItem.js b/src/components/BaseMiniContextMenuItem.js
index acf5d165d7c7..0e9085b54c17 100644
--- a/src/components/BaseMiniContextMenuItem.js
+++ b/src/components/BaseMiniContextMenuItem.js
@@ -8,6 +8,8 @@ import getButtonState from '../libs/getButtonState';
 import variables from '../styles/variables';
 import Tooltip from './Tooltip';
 import PressableWithoutFeedback from './Pressable/PressableWithoutFeedback';
+import ReportActionComposeFocusManager from '../libs/ReportActionComposeFocusManager';
+import DomUtils from '../libs/DomUtils';
 
 const propTypes = {
     /**
@@ -53,7 +55,14 @@ function BaseMiniContextMenuItem(props) {
             <PressableWithoutFeedback
                 ref={props.innerRef}
                 onPress={props.onPress}
-                onMouseDown={(e) => e.preventDefault()}
+                onMouseDown={(e) => {
+                    if (!ReportActionComposeFocusManager.isFocused() && !ReportActionComposeFocusManager.isEditFocused()) {
+                        DomUtils.getActiveElement().blur();
+                        return;
+                    }
+
+                    e.preventDefault();
+                }}
                 accessibilityLabel={props.tooltipText}
                 style={({hovered, pressed}) => [
                     styles.reportActionContextMenuMiniButton,
diff --git a/src/components/BlockingViews/FullPageNotFoundView.js b/src/components/BlockingViews/FullPageNotFoundView.js
index 54bdc015de37..a9c4bf63b65e 100644
--- a/src/components/BlockingViews/FullPageNotFoundView.js
+++ b/src/components/BlockingViews/FullPageNotFoundView.js
@@ -8,6 +8,7 @@ import Navigation from '../../libs/Navigation/Navigation';
 import variables from '../../styles/variables';
 import styles from '../../styles/styles';
 import useLocalize from '../../hooks/useLocalize';
+import ROUTES from '../../ROUTES';
 
 const propTypes = {
     /** Child elements */
@@ -44,7 +45,7 @@ const defaultProps = {
     titleKey: 'notFound.notHere',
     subtitleKey: 'notFound.pageNotFound',
     linkKey: 'notFound.goBackHome',
-    onBackButtonPress: Navigation.goBack,
+    onBackButtonPress: () => Navigation.goBack(ROUTES.HOME),
     shouldShowLink: true,
     shouldShowBackButton: true,
     onLinkPress: () => Navigation.dismissModal(),
diff --git a/src/components/Button/index.js b/src/components/Button/index.js
index bfde528a4750..4ca933a45d6f 100644
--- a/src/components/Button/index.js
+++ b/src/components/Button/index.js
@@ -145,7 +145,7 @@ const defaultProps = {
     style: [],
     innerStyles: [],
     textStyles: [],
-    shouldUseDefaultHover: false,
+    shouldUseDefaultHover: true,
     success: false,
     danger: false,
     children: null,
@@ -218,6 +218,7 @@ class Button extends Component {
                     this.props.icon && styles.textAlignLeft,
                     ...this.props.textStyles,
                 ]}
+                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
             >
                 {this.props.text}
             </Text>
@@ -305,6 +306,7 @@ class Button extends Component {
                 ]}
                 nativeID={this.props.nativeID}
                 accessibilityLabel={this.props.accessibilityLabel}
+                accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
                 hoverDimmingValue={1}
             >
                 {this.renderContent()}
diff --git a/src/components/ButtonWithDropdownMenu.js b/src/components/ButtonWithDropdownMenu.js
index 62eeb3030619..54d6c0deac5a 100644
--- a/src/components/ButtonWithDropdownMenu.js
+++ b/src/components/ButtonWithDropdownMenu.js
@@ -32,7 +32,7 @@ const propTypes = {
     style: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
 
     /** Menu options to display */
-    /** e.g. [{text: 'Pay with Expensify', icon: Wallet}, {text: 'PayPal', icon: PayPal}] */
+    /** e.g. [{text: 'Pay with Expensify', icon: Wallet}] */
     options: PropTypes.arrayOf(
         PropTypes.shape({
             value: PropTypes.string.isRequired,
diff --git a/src/components/CardPreview.js b/src/components/CardPreview.js
new file mode 100644
index 000000000000..4f774d67360c
--- /dev/null
+++ b/src/components/CardPreview.js
@@ -0,0 +1,68 @@
+import React from 'react';
+import {View} from 'react-native';
+import {withOnyx} from 'react-native-onyx';
+import PropTypes from 'prop-types';
+import styles from '../styles/styles';
+import Text from './Text';
+import usePrivatePersonalDetails from '../hooks/usePrivatePersonalDetails';
+import ONYXKEYS from '../ONYXKEYS';
+import ExpensifyCardImage from '../../assets/images/expensify-card.svg';
+import variables from '../styles/variables';
+
+const propTypes = {
+    /** User's private personal details */
+    privatePersonalDetails: PropTypes.shape({
+        legalFirstName: PropTypes.string,
+        legalLastName: PropTypes.string,
+    }),
+    /** Session info for the currently logged in user. */
+    session: PropTypes.shape({
+        /** Currently logged-in user email */
+        email: PropTypes.string,
+    }),
+};
+
+const defaultProps = {
+    privatePersonalDetails: {
+        legalFirstName: '',
+        legalLastName: '',
+    },
+    session: {
+        email: '',
+    },
+};
+
+function CardPreview({privatePersonalDetails: {legalFirstName, legalLastName}, session: {email}}) {
+    usePrivatePersonalDetails();
+    const cardHolder = legalFirstName && legalLastName ? `${legalFirstName} ${legalLastName}` : email;
+
+    return (
+        <View style={styles.walletCard}>
+            <ExpensifyCardImage
+                pointerEvents="none"
+                height={variables.cardPreviewHeight}
+                width={variables.cardPreviewWidth}
+            />
+            <Text
+                style={styles.walletCardHolder}
+                numberOfLines={1}
+                ellipsizeMode="tail"
+            >
+                {cardHolder}
+            </Text>
+        </View>
+    );
+}
+
+CardPreview.propTypes = propTypes;
+CardPreview.defaultProps = defaultProps;
+CardPreview.displayName = 'CardPreview';
+
+export default withOnyx({
+    privatePersonalDetails: {
+        key: ONYXKEYS.PRIVATE_PERSONAL_DETAILS,
+    },
+    session: {
+        key: ONYXKEYS.SESSION,
+    },
+})(CardPreview);
diff --git a/src/components/CategoryPicker/categoryPickerPropTypes.js b/src/components/CategoryPicker/categoryPickerPropTypes.js
index ccc1643021ce..6f2800a5d98f 100644
--- a/src/components/CategoryPicker/categoryPickerPropTypes.js
+++ b/src/components/CategoryPicker/categoryPickerPropTypes.js
@@ -2,23 +2,29 @@ import PropTypes from 'prop-types';
 import categoryPropTypes from '../categoryPropTypes';
 
 const propTypes = {
-    /** The report ID of the IOU */
-    reportID: PropTypes.string.isRequired,
-
     /** The policyID we are getting categories for */
     policyID: PropTypes.string,
 
-    /** The type of IOU report, i.e. bill, request, send */
-    iouType: PropTypes.string.isRequired,
+    /** The selected category of an expense */
+    selectedCategory: PropTypes.string,
 
     /* 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),
+
+    /** Callback to fire when a category is pressed */
+    onSubmit: PropTypes.func.isRequired,
 };
 
 const defaultProps = {
     policyID: '',
-    policyCategories: null,
+    selectedCategory: '',
+    policyCategories: {},
+    policyRecentlyUsedCategories: [],
 };
 
 export {propTypes, defaultProps};
diff --git a/src/components/CategoryPicker/index.js b/src/components/CategoryPicker/index.js
index 163ab6673ca2..ef8b1d71ad1d 100644
--- a/src/components/CategoryPicker/index.js
+++ b/src/components/CategoryPicker/index.js
@@ -1,47 +1,86 @@
-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 OptionsListUtils from '../../libs/OptionsListUtils';
+import OptionsSelector from '../OptionsSelector';
+import useLocalize from '../../hooks/useLocalize';
 
-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();
+function CategoryPicker({selectedCategory, policyCategories, policyRecentlyUsedCategories, onSubmit}) {
+    const {translate} = useLocalize();
+    const [searchValue, setSearchValue] = useState('');
+
+    const policyCategoriesCount = OptionsListUtils.getEnabledCategoriesCount(_.values(policyCategories));
+    const isCategoriesCountBelowThreshold = policyCategoriesCount < CONST.CATEGORY_LIST_THRESHOLD;
+
+    const selectedOptions = useMemo(() => {
+        if (!selectedCategory) {
+            return [];
+        }
 
         return [
             {
-                data: categoryList,
+                name: selectedCategory,
+                enabled: true,
+                accountID: null,
             },
         ];
-    }, [policyCategories]);
+    }, [selectedCategory]);
+
+    const sections = useMemo(() => {
+        const {categoryOptions} = OptionsListUtils.getFilteredOptions(
+            {},
+            {},
+            [],
+            searchValue,
+            selectedOptions,
+            [],
+            false,
+            false,
+            true,
+            policyCategories,
+            policyRecentlyUsedCategories,
+            false,
+        );
 
-    const navigateBack = () => {
-        Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
-    };
+        return categoryOptions;
+    }, [policyCategories, policyRecentlyUsedCategories, searchValue, selectedOptions]);
+
+    const initialFocusedIndex = useMemo(() => {
+        let categoryInitialFocusedIndex = 0;
+
+        if (!_.isEmpty(searchValue) || isCategoriesCountBelowThreshold) {
+            const index = _.findIndex(lodashGet(sections, '[0].data', []), (category) => category.searchText === selectedCategory);
+
+            categoryInitialFocusedIndex = index === -1 ? 0 : index;
+        }
+
+        return categoryInitialFocusedIndex;
+    }, [selectedCategory, searchValue, isCategoriesCountBelowThreshold, sections]);
+
+    const headerMessage = OptionsListUtils.getHeaderMessage(lodashGet(sections, '[0].data.length', 0) > 0, false, searchValue);
+    const shouldShowTextInput = !isCategoriesCountBelowThreshold;
 
     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={onSubmit}
+        />
     );
 }
 
@@ -53,4 +92,7 @@ export default withOnyx({
     policyCategories: {
         key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
     },
+    policyRecentlyUsedCategories: {
+        key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${policyID}`,
+    },
 })(CategoryPicker);
diff --git a/src/components/CollapsibleSection/index.js b/src/components/CollapsibleSection/index.js
index e9c3a90a7b30..7009d1905e1d 100644
--- a/src/components/CollapsibleSection/index.js
+++ b/src/components/CollapsibleSection/index.js
@@ -51,6 +51,7 @@ class CollapsibleSection extends React.Component {
                     <Text
                         selectable={false}
                         style={[styles.flex1, styles.textStrong]}
+                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                     >
                         {this.props.title}
                     </Text>
diff --git a/src/components/Composer/index.android.js b/src/components/Composer/index.android.js
index d0805cbcc7c3..1132efa9e50e 100644
--- a/src/components/Composer/index.android.js
+++ b/src/components/Composer/index.android.js
@@ -97,7 +97,9 @@ function Composer({shouldClear, onClear, isDisabled, maxLines, forwardedRef, isC
      * @return {Number}
      */
     const maxNumberOfLines = useMemo(() => {
-        if (isComposerFullSize) return 1000000;
+        if (isComposerFullSize) {
+            return 1000000;
+        }
         return maxLines;
     }, [isComposerFullSize, maxLines]);
 
diff --git a/src/components/Composer/index.ios.js b/src/components/Composer/index.ios.js
index c0a3859e6d01..0b2c93f6639e 100644
--- a/src/components/Composer/index.ios.js
+++ b/src/components/Composer/index.ios.js
@@ -97,7 +97,9 @@ function Composer({shouldClear, onClear, isDisabled, maxLines, forwardedRef, isC
      * @return {Number}
      */
     const maxNumberOfLines = useMemo(() => {
-        if (isComposerFullSize) return undefined;
+        if (isComposerFullSize) {
+            return;
+        }
         return maxLines;
     }, [isComposerFullSize, maxLines]);
 
diff --git a/src/components/Composer/index.js b/src/components/Composer/index.js
index 44075a4ec1eb..e7b18bbd8d69 100755
--- a/src/components/Composer/index.js
+++ b/src/components/Composer/index.js
@@ -358,7 +358,7 @@ function Composer({
         const paddingTopAndBottom = parseInt(computedStyle.paddingBottom, 10) + parseInt(computedStyle.paddingTop, 10);
         setTextInputWidth(computedStyle.width);
 
-        const computedNumberOfLines = ComposerUtils.getNumberOfLines(maxLines, lineHeight, paddingTopAndBottom, textInput.current.scrollHeight);
+        const computedNumberOfLines = ComposerUtils.getNumberOfLines(lineHeight, paddingTopAndBottom, textInput.current.scrollHeight, maxLines);
         const generalNumberOfLines = computedNumberOfLines === 0 ? numberOfLinesProp : computedNumberOfLines;
 
         onNumberOfLinesChange(generalNumberOfLines);
diff --git a/src/components/ConfirmContent.js b/src/components/ConfirmContent.js
index 9a72d4e7d584..469efb4f25d9 100644
--- a/src/components/ConfirmContent.js
+++ b/src/components/ConfirmContent.js
@@ -100,8 +100,8 @@ function ConfirmContent(props) {
                         <View style={[styles.flexRow, styles.mb3]}>
                             <Icon
                                 src={props.iconSource}
-                                width={variables.downloadAppModalAppIconSize}
-                                height={variables.downloadAppModalAppIconSize}
+                                width={variables.appModalAppIconSize}
+                                height={variables.appModalAppIconSize}
                                 additionalStyles={[...props.iconAdditionalStyles]}
                             />
                         </View>
@@ -133,7 +133,6 @@ function ConfirmContent(props) {
                             style={[styles.mt3, styles.noSelect]}
                             onPress={props.onCancel}
                             text={props.cancelText || translate('common.no')}
-                            shouldUseDefaultHover
                         />
                     )}
                 </>
@@ -144,7 +143,6 @@ function ConfirmContent(props) {
                             style={[styles.noSelect, styles.flex1]}
                             onPress={props.onCancel}
                             text={props.cancelText || translate('common.no')}
-                            shouldUseDefaultHover
                             medium
                         />
                     )}
diff --git a/src/components/ConfirmedRoute.js b/src/components/ConfirmedRoute.js
index aa7c38e0c535..dab30e60ca55 100644
--- a/src/components/ConfirmedRoute.js
+++ b/src/components/ConfirmedRoute.js
@@ -1,21 +1,21 @@
 import React, {useEffect} from 'react';
 import PropTypes from 'prop-types';
-import {View} from 'react-native';
 
 import {withOnyx} from 'react-native-onyx';
 import lodashGet from 'lodash/get';
+import lodashIsNil from 'lodash/isNil';
 import _ from 'underscore';
 import ONYXKEYS from '../ONYXKEYS';
 import CONST from '../CONST';
 import * as MapboxToken from '../libs/actions/MapboxToken';
+import * as TransactionUtils from '../libs/TransactionUtils';
 import * as Expensicons from './Icon/Expensicons';
 import theme from '../styles/themes/default';
 import styles from '../styles/styles';
 import transactionPropTypes from './transactionPropTypes';
-import BlockingView from './BlockingViews/BlockingView';
+import PendingMapView from './MapView/PendingMapView';
 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 */
@@ -43,11 +43,11 @@ const getWaypointMarkers = (waypoints) => {
     const lastWaypointIndex = numberOfWaypoints - 1;
     return _.filter(
         _.map(waypoints, (waypoint, key) => {
-            if (!waypoint || waypoint.lng === undefined || waypoint.lat === undefined) {
+            if (!waypoint || lodashIsNil(waypoint.lat) || lodashIsNil(waypoint.lng)) {
                 return;
             }
 
-            const index = Number(key.replace('waypoint', ''));
+            const index = TransactionUtils.getWaypointIndex(key);
             let MarkerComponent;
             if (index === 0) {
                 MarkerComponent = Expensicons.DotIndicatorUnfilled;
@@ -75,7 +75,6 @@ const getWaypointMarkers = (waypoints) => {
 
 function ConfirmedRoute({mapboxAccessToken, transaction}) {
     const {isOffline} = useNetwork();
-    const {translate} = useLocalize();
     const {route0: route} = transaction.routes || {};
     const waypoints = lodashGet(transaction, 'comment.waypoints', {});
     const coordinates = lodashGet(route, 'geometry.coordinates', []);
@@ -89,7 +88,7 @@ function ConfirmedRoute({mapboxAccessToken, transaction}) {
     return (
         <>
             {!isOffline && Boolean(mapboxAccessToken.token) ? (
-                <MapView
+                <DistanceMapView
                     accessToken={mapboxAccessToken.token}
                     mapPadding={CONST.MAP_PADDING}
                     pitchEnabled={false}
@@ -103,14 +102,7 @@ function ConfirmedRoute({mapboxAccessToken, transaction}) {
                     styleURL={CONST.MAPBOX.STYLE_URL}
                 />
             ) : (
-                <View style={[styles.mapPendingView]}>
-                    <BlockingView
-                        icon={Expensicons.EmptyStateRoutePending}
-                        title={translate('distance.mapPending.title')}
-                        subtitle={isOffline ? translate('distance.mapPending.subtitle') : translate('distance.mapPending.onlineSubtitle')}
-                        shouldShowLink={false}
-                    />
-                </View>
+                <PendingMapView />
             )}
         </>
     );
diff --git a/src/components/ContextMenuItem.js b/src/components/ContextMenuItem.js
index c7ca3f948da4..2314f2fcf64e 100644
--- a/src/components/ContextMenuItem.js
+++ b/src/components/ContextMenuItem.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {forwardRef, useImperativeHandle} from 'react';
 import PropTypes from 'prop-types';
 import MenuItem from './MenuItem';
 import Icon from './Icon';
@@ -34,6 +34,12 @@ const propTypes = {
 
     /** The action accept for anonymous user or not */
     isAnonymousAction: PropTypes.bool,
+
+    /** Whether the menu item is focused or not */
+    isFocused: PropTypes.bool,
+
+    /** Forwarded ref to ContextMenuItem */
+    innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
 };
 
 const defaultProps = {
@@ -42,9 +48,11 @@ const defaultProps = {
     successText: '',
     description: '',
     isAnonymousAction: false,
+    isFocused: false,
+    innerRef: null,
 };
 
-function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, description, isAnonymousAction}) {
+function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, description, isAnonymousAction, isFocused, innerRef}) {
     const {windowWidth} = useWindowDimensions();
     const [isThrottledButtonActive, setThrottledButtonInactive] = useThrottledButtonState();
 
@@ -61,6 +69,8 @@ function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini,
         }
     };
 
+    useImperativeHandle(innerRef, () => ({triggerPressAndUpdateSuccess}));
+
     const itemIcon = !isThrottledButtonActive && successIcon ? successIcon : icon;
     const itemText = !isThrottledButtonActive && successText ? successText : text;
 
@@ -89,6 +99,7 @@ function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini,
             descriptionTextStyle={styles.breakAll}
             style={getContextMenuItemStyles(windowWidth)}
             isAnonymousAction={isAnonymousAction}
+            focused={isFocused}
         />
     );
 }
@@ -97,4 +108,10 @@ ContextMenuItem.propTypes = propTypes;
 ContextMenuItem.defaultProps = defaultProps;
 ContextMenuItem.displayName = 'ContextMenuItem';
 
-export default ContextMenuItem;
+export default forwardRef((props, ref) => (
+    <ContextMenuItem
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...props}
+        innerRef={ref}
+    />
+));
diff --git a/src/components/CountryPicker/CountrySelectorModal.js b/src/components/CountryPicker/CountrySelectorModal.js
deleted file mode 100644
index 126cea7e842e..000000000000
--- a/src/components/CountryPicker/CountrySelectorModal.js
+++ /dev/null
@@ -1,102 +0,0 @@
-import _ from 'underscore';
-import React, {useMemo, useEffect} from 'react';
-import PropTypes from 'prop-types';
-import CONST from '../../CONST';
-import useLocalize from '../../hooks/useLocalize';
-import HeaderWithBackButton from '../HeaderWithBackButton';
-import SelectionList from '../SelectionList';
-import Modal from '../Modal';
-import ScreenWrapper from '../ScreenWrapper';
-import styles from '../../styles/styles';
-import searchCountryOptions from '../../libs/searchCountryOptions';
-import StringUtils from '../../libs/StringUtils';
-
-const propTypes = {
-    /** Whether the modal is visible */
-    isVisible: PropTypes.bool.isRequired,
-
-    /** Country value selected  */
-    currentCountry: PropTypes.string,
-
-    /** Function to call when the user selects a Country */
-    onCountrySelected: PropTypes.func,
-
-    /** Function to call when the user closes the Country modal */
-    onClose: PropTypes.func,
-
-    /** The search value from the selection list */
-    searchValue: PropTypes.string.isRequired,
-
-    /** Function to call when the user types in the search input */
-    setSearchValue: PropTypes.func.isRequired,
-};
-
-const defaultProps = {
-    currentCountry: '',
-    onClose: () => {},
-    onCountrySelected: () => {},
-};
-
-function CountrySelectorModal({currentCountry, isVisible, onClose, onCountrySelected, setSearchValue, searchValue}) {
-    const {translate} = useLocalize();
-
-    useEffect(() => {
-        if (isVisible) {
-            return;
-        }
-        setSearchValue('');
-    }, [isVisible, setSearchValue]);
-
-    const countries = useMemo(
-        () =>
-            _.map(translate('allCountries'), (countryName, countryISO) => ({
-                value: countryISO,
-                keyForList: countryISO,
-                text: countryName,
-                isSelected: currentCountry === countryISO,
-                searchValue: StringUtils.sanitizeString(`${countryISO}${countryName}`),
-            })),
-        [translate, currentCountry],
-    );
-
-    const searchResults = searchCountryOptions(searchValue, countries);
-    const headerMessage = searchValue.trim() && !searchResults.length ? translate('common.noResultsFound') : '';
-
-    return (
-        <Modal
-            type={CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED}
-            isVisible={isVisible}
-            onClose={onClose}
-            onModalHide={onClose}
-            hideModalContentWhileAnimating
-            useNativeDriver
-        >
-            <ScreenWrapper
-                style={[styles.pb0]}
-                includePaddingTop={false}
-                includeSafeAreaPaddingBottom={false}
-            >
-                <HeaderWithBackButton
-                    title={translate('common.country')}
-                    onBackButtonPress={onClose}
-                />
-                <SelectionList
-                    headerMessage={headerMessage}
-                    textInputLabel={translate('common.country')}
-                    textInputValue={searchValue}
-                    sections={[{data: searchResults, indexOffset: 0}]}
-                    onSelectRow={onCountrySelected}
-                    onChangeText={setSearchValue}
-                    shouldDelayFocus
-                    initiallyFocusedOptionKey={currentCountry}
-                />
-            </ScreenWrapper>
-        </Modal>
-    );
-}
-
-CountrySelectorModal.propTypes = propTypes;
-CountrySelectorModal.defaultProps = defaultProps;
-CountrySelectorModal.displayName = 'CountrySelectorModal';
-
-export default CountrySelectorModal;
diff --git a/src/components/CountryPicker/index.js b/src/components/CountryPicker/index.js
deleted file mode 100644
index c6bbae0dd645..000000000000
--- a/src/components/CountryPicker/index.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import React, {useState} from 'react';
-import {View} from 'react-native';
-import PropTypes from 'prop-types';
-import styles from '../../styles/styles';
-import MenuItemWithTopDescription from '../MenuItemWithTopDescription';
-import useLocalize from '../../hooks/useLocalize';
-import CountrySelectorModal from './CountrySelectorModal';
-import FormHelpMessage from '../FormHelpMessage';
-import refPropTypes from '../refPropTypes';
-
-const propTypes = {
-    /** Form Error description */
-    errorText: PropTypes.string,
-
-    /** Country to display */
-    value: PropTypes.string,
-
-    /** Callback to call when the input changes */
-    onInputChange: PropTypes.func,
-
-    /** A ref to forward to MenuItemWithTopDescription */
-    forwardedRef: refPropTypes,
-};
-
-const defaultProps = {
-    value: undefined,
-    forwardedRef: undefined,
-    errorText: '',
-    onInputChange: () => {},
-};
-
-function CountryPicker({value, errorText, onInputChange, forwardedRef}) {
-    const {translate} = useLocalize();
-    const allCountries = translate('allCountries');
-    const [isPickerVisible, setIsPickerVisible] = useState(false);
-    const [searchValue, setSearchValue] = useState('');
-
-    const showPickerModal = () => {
-        setIsPickerVisible(true);
-    };
-
-    const hidePickerModal = () => {
-        setIsPickerVisible(false);
-    };
-
-    const updateCountryInput = (country) => {
-        onInputChange(country.value);
-        hidePickerModal();
-    };
-
-    const title = allCountries[value] || '';
-    const descStyle = title.length === 0 ? styles.textNormal : null;
-
-    return (
-        <View>
-            <MenuItemWithTopDescription
-                ref={forwardedRef}
-                shouldShowRightIcon
-                title={title}
-                descriptionTextStyle={descStyle}
-                description={translate('common.country')}
-                onPress={showPickerModal}
-            />
-            <View style={styles.ml5}>
-                <FormHelpMessage message={errorText} />
-            </View>
-            <CountrySelectorModal
-                isVisible={isPickerVisible}
-                currentCountry={value}
-                searchValue={searchValue}
-                setSearchValue={setSearchValue}
-                onClose={hidePickerModal}
-                onCountrySelected={updateCountryInput}
-            />
-        </View>
-    );
-}
-
-CountryPicker.propTypes = propTypes;
-CountryPicker.defaultProps = defaultProps;
-CountryPicker.displayName = 'CountryPicker';
-
-export default React.forwardRef((props, ref) => (
-    <CountryPicker
-        // eslint-disable-next-line react/jsx-props-no-spreading
-        {...props}
-        forwardedRef={ref}
-    />
-));
diff --git a/src/components/CountrySelector.js b/src/components/CountrySelector.js
new file mode 100644
index 000000000000..2788f3cea8e3
--- /dev/null
+++ b/src/components/CountrySelector.js
@@ -0,0 +1,77 @@
+import React, {useEffect} from 'react';
+import PropTypes from 'prop-types';
+import {View} from 'react-native';
+import styles from '../styles/styles';
+import Navigation from '../libs/Navigation/Navigation';
+import ROUTES from '../ROUTES';
+import useLocalize from '../hooks/useLocalize';
+import MenuItemWithTopDescription from './MenuItemWithTopDescription';
+import FormHelpMessage from './FormHelpMessage';
+
+const propTypes = {
+    /** Form error text. e.g when no country is selected */
+    errorText: PropTypes.string,
+
+    /** Callback called when the country changes. */
+    onInputChange: PropTypes.func.isRequired,
+
+    /** Current selected country  */
+    value: PropTypes.string,
+
+    /** inputID used by the Form component */
+    // eslint-disable-next-line react/no-unused-prop-types
+    inputID: PropTypes.string.isRequired,
+
+    /** React ref being forwarded to the MenuItemWithTopDescription */
+    forwardedRef: PropTypes.func,
+};
+
+const defaultProps = {
+    errorText: '',
+    value: undefined,
+    forwardedRef: () => {},
+};
+
+function CountrySelector({errorText, value: countryCode, onInputChange, forwardedRef}) {
+    const {translate} = useLocalize();
+
+    const title = countryCode ? translate(`allCountries.${countryCode}`) : '';
+    const countryTitleDescStyle = title.length === 0 ? styles.textNormal : null;
+
+    useEffect(() => {
+        // This will cause the form to revalidate and remove any error related to country name
+        onInputChange(countryCode);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [countryCode]);
+
+    return (
+        <View>
+            <MenuItemWithTopDescription
+                shouldShowRightIcon
+                title={title}
+                ref={forwardedRef}
+                descriptionTextStyle={countryTitleDescStyle}
+                description={translate('common.country')}
+                onPress={() => {
+                    const activeRoute = Navigation.getActiveRoute().replace(/\?.*/, '');
+                    Navigation.navigate(ROUTES.SETTINGS_PERSONAL_DETAILS_ADDRESS_COUNTRY.getRoute(countryCode, activeRoute));
+                }}
+            />
+            <View style={styles.ml5}>
+                <FormHelpMessage message={errorText} />
+            </View>
+        </View>
+    );
+}
+
+CountrySelector.propTypes = propTypes;
+CountrySelector.defaultProps = defaultProps;
+CountrySelector.displayName = 'CountrySelector';
+
+export default React.forwardRef((props, ref) => (
+    <CountrySelector
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...props}
+        forwardedRef={ref}
+    />
+));
diff --git a/src/components/CurrentUserPersonalDetailsSkeletonView/index.js b/src/components/CurrentUserPersonalDetailsSkeletonView/index.js
index 6e6c46e971c0..cc305a628820 100644
--- a/src/components/CurrentUserPersonalDetailsSkeletonView/index.js
+++ b/src/components/CurrentUserPersonalDetailsSkeletonView/index.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import _ from 'underscore';
 import SkeletonViewContentLoader from 'react-content-loader/native';
 import {Circle, Rect} from 'react-native-svg';
 import {View} from 'react-native';
@@ -12,14 +13,26 @@ import styles from '../../styles/styles';
 const propTypes = {
     /** Whether to animate the skeleton view */
     shouldAnimate: PropTypes.bool,
+
+    /** The size of the avatar */
+    avatarSize: PropTypes.oneOf(_.values(CONST.AVATAR_SIZE)),
+
+    /** Background color of the skeleton view */
+    backgroundColor: PropTypes.string,
+
+    /** Foreground color of the skeleton view */
+    foregroundColor: PropTypes.string,
 };
 
 const defaultProps = {
     shouldAnimate: true,
+    avatarSize: CONST.AVATAR_SIZE.LARGE,
+    backgroundColor: themeColors.highlightBG,
+    foregroundColor: themeColors.border,
 };
 
 function CurrentUserPersonalDetailsSkeletonView(props) {
-    const avatarPlaceholderSize = StyleUtils.getAvatarSize(CONST.AVATAR_SIZE.LARGE);
+    const avatarPlaceholderSize = StyleUtils.getAvatarSize(props.avatarSize);
     const avatarPlaceholderRadius = avatarPlaceholderSize / 2;
     const spaceBetweenAvatarAndHeadline = styles.mb3.marginBottom + styles.mt1.marginTop + (variables.lineHeightXXLarge - variables.fontSizeXLarge) / 2;
     const headlineSize = variables.fontSizeXLarge;
@@ -29,8 +42,8 @@ function CurrentUserPersonalDetailsSkeletonView(props) {
         <View style={styles.avatarSectionWrapperSkeleton}>
             <SkeletonViewContentLoader
                 animate={props.shouldAnimate}
-                backgroundColor={themeColors.highlightBG}
-                foregroundColor={themeColors.border}
+                backgroundColor={props.backgroundColor}
+                foregroundColor={props.foregroundColor}
                 height={avatarPlaceholderSize + spaceBetweenAvatarAndHeadline + headlineSize + spaceBetweenHeadlineAndLabel + labelSize}
             >
                 <Circle
diff --git a/src/components/CustomStatusBar/index.js b/src/components/CustomStatusBar/index.js
index 76752cb549e1..4848e6e35f59 100644
--- a/src/components/CustomStatusBar/index.js
+++ b/src/components/CustomStatusBar/index.js
@@ -1,11 +1,22 @@
 import React, {useEffect} from 'react';
 import StatusBar from '../../libs/StatusBar';
+import Navigation, {navigationRef} from '../../libs/Navigation/Navigation';
 import themeColors from '../../styles/themes/default';
 
 function CustomStatusBar() {
     useEffect(() => {
-        StatusBar.setBarStyle('light-content', true);
-        StatusBar.setBackgroundColor(themeColors.appBG);
+        Navigation.isNavigationReady().then(() => {
+            // Set the status bar colour depending on the current route.
+            // If we don't have any colour defined for a route, fall back to
+            // appBG color.
+            const currentRoute = navigationRef.getCurrentRoute();
+            let currentScreenBackgroundColor = themeColors.appBG;
+            if (currentRoute && 'name' in currentRoute && currentRoute.name in themeColors.PAGE_BACKGROUND_COLORS) {
+                currentScreenBackgroundColor = themeColors.PAGE_BACKGROUND_COLORS[currentRoute.name];
+            }
+            StatusBar.setBarStyle('light-content', true);
+            StatusBar.setBackgroundColor(currentScreenBackgroundColor);
+        });
     }, []);
     return <StatusBar />;
 }
diff --git a/src/components/DeeplinkWrapper/DeeplinkRedirectLoadingIndicator.js b/src/components/DeeplinkWrapper/DeeplinkRedirectLoadingIndicator.js
index e31429af61b6..61614c7e49e6 100644
--- a/src/components/DeeplinkWrapper/DeeplinkRedirectLoadingIndicator.js
+++ b/src/components/DeeplinkWrapper/DeeplinkRedirectLoadingIndicator.js
@@ -7,7 +7,7 @@ import Text from '../Text';
 import Icon from '../Icon';
 import * as Illustrations from '../Icon/Illustrations';
 import * as Expensicons from '../Icon/Expensicons';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
 import styles from '../../styles/styles';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
 import Navigation from '../../libs/Navigation/Navigation';
@@ -56,7 +56,7 @@ function DeeplinkRedirectLoadingIndicator({translate, openLinkInBrowser, session
                 <Icon
                     width={154}
                     height={34}
-                    fill={colors.green}
+                    fill={themeColors.success}
                     src={Expensicons.ExpensifyWordmark}
                 />
             </View>
diff --git a/src/components/DistanceMapView/distanceMapViewPropTypes.js b/src/components/DistanceMapView/distanceMapViewPropTypes.js
new file mode 100644
index 000000000000..05068cbc9b34
--- /dev/null
+++ b/src/components/DistanceMapView/distanceMapViewPropTypes.js
@@ -0,0 +1,55 @@
+import PropTypes from 'prop-types';
+
+const propTypes = {
+    // Public access token to be used to fetch map data from Mapbox.
+    accessToken: PropTypes.string.isRequired,
+
+    // Style applied to MapView component. Note some of the View Style props are not available on ViewMap
+    style: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
+
+    // Link to the style JSON document.
+    styleURL: PropTypes.string,
+
+    // Whether map can tilt in the vertical direction.
+    pitchEnabled: PropTypes.bool,
+
+    // Padding to apply when the map is adjusted to fit waypoints and directions
+    mapPadding: PropTypes.number,
+
+    // Initial coordinate and zoom level
+    initialState: PropTypes.shape({
+        location: PropTypes.arrayOf(PropTypes.number).isRequired,
+        zoom: PropTypes.number.isRequired,
+    }),
+
+    // Locations on which to put markers
+    waypoints: PropTypes.arrayOf(
+        PropTypes.shape({
+            id: PropTypes.string,
+            coordinate: PropTypes.arrayOf(PropTypes.number),
+            markerComponent: PropTypes.oneOfType([PropTypes.element, PropTypes.func]),
+        }),
+    ),
+
+    // List of coordinates which together forms a direction.
+    directionCoordinates: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.number)),
+
+    // Callback to call when the map is idle / ready
+    onMapReady: PropTypes.func,
+
+    // Optional additional styles to be applied to the overlay
+    overlayStyle: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
+};
+
+const defaultProps = {
+    styleURL: undefined,
+    pitchEnabled: false,
+    mapPadding: 0,
+    initialState: undefined,
+    waypoints: undefined,
+    directionCoordinates: undefined,
+    onMapReady: () => {},
+    overlayStyle: undefined,
+};
+
+export {propTypes, defaultProps};
diff --git a/src/components/DistanceMapView/index.android.js b/src/components/DistanceMapView/index.android.js
new file mode 100644
index 000000000000..ea72fb4de299
--- /dev/null
+++ b/src/components/DistanceMapView/index.android.js
@@ -0,0 +1,48 @@
+import React, {useState} from 'react';
+import {View} from 'react-native';
+import _ from 'underscore';
+import BlockingView from '../BlockingViews/BlockingView';
+import MapView from '../MapView';
+import styles from '../../styles/styles';
+import useNetwork from '../../hooks/useNetwork';
+import useLocalize from '../../hooks/useLocalize';
+import * as Expensicons from '../Icon/Expensicons';
+import * as StyleUtils from '../../styles/StyleUtils';
+import * as distanceMapViewPropTypes from './distanceMapViewPropTypes';
+
+function DistanceMapView(props) {
+    const [isMapReady, setIsMapReady] = useState(false);
+    const {isOffline} = useNetwork();
+    const {translate} = useLocalize();
+
+    return (
+        <>
+            <MapView
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {..._.omit(props, 'overlayStyle')}
+                onMapReady={() => {
+                    if (isMapReady) {
+                        return;
+                    }
+                    setIsMapReady(true);
+                }}
+            />
+            {!isMapReady && (
+                <View style={StyleUtils.combineStyles(styles.mapViewOverlay, props.overlayStyle)}>
+                    <BlockingView
+                        icon={Expensicons.EmptyStateRoutePending}
+                        title={translate('distance.mapPending.title')}
+                        subtitle={isOffline ? translate('distance.mapPending.subtitle') : translate('distance.mapPending.onlineSubtitle')}
+                        shouldShowLink={false}
+                    />
+                </View>
+            )}
+        </>
+    );
+}
+
+DistanceMapView.propTypes = distanceMapViewPropTypes.propTypes;
+DistanceMapView.defaultProps = distanceMapViewPropTypes.defaultProps;
+DistanceMapView.displayName = 'DistanceMapView';
+
+export default DistanceMapView;
diff --git a/src/components/DistanceMapView/index.js b/src/components/DistanceMapView/index.js
new file mode 100644
index 000000000000..24bdf99382d1
--- /dev/null
+++ b/src/components/DistanceMapView/index.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import _ from 'underscore';
+import MapView from '../MapView';
+import * as distanceMapViewPropTypes from './distanceMapViewPropTypes';
+
+function DistanceMapView(props) {
+    // eslint-disable-next-line react/jsx-props-no-spreading
+    return <MapView {..._.omit(props, 'overlayStyle')} />;
+}
+
+DistanceMapView.propTypes = distanceMapViewPropTypes.propTypes;
+DistanceMapView.defaultProps = distanceMapViewPropTypes.defaultProps;
+DistanceMapView.displayName = 'DistanceMapView';
+
+export default DistanceMapView;
diff --git a/src/components/DistanceRequest.js b/src/components/DistanceRequest.js
index c966cf62be96..aa7878337f21 100644
--- a/src/components/DistanceRequest.js
+++ b/src/components/DistanceRequest.js
@@ -2,59 +2,48 @@ import React, {useEffect, useMemo, useState, useRef} from 'react';
 import {ScrollView, View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import lodashGet from 'lodash/get';
-import lodashHas from 'lodash/has';
-import lodashIsNull from 'lodash/isNull';
+import lodashIsNil from 'lodash/isNil';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
-
 import CONST from '../CONST';
 import ROUTES from '../ROUTES';
 import ONYXKEYS from '../ONYXKEYS';
-
 import styles from '../styles/styles';
 import variables from '../styles/variables';
-import theme from '../styles/themes/default';
-
-import transactionPropTypes from './transactionPropTypes';
-
+import LinearGradient from './LinearGradient';
+import * as MapboxToken from '../libs/actions/MapboxToken';
 import useNetwork from '../hooks/useNetwork';
-import usePrevious from '../hooks/usePrevious';
 import useLocalize from '../hooks/useLocalize';
-
-import * as ErrorUtils from '../libs/ErrorUtils';
 import Navigation from '../libs/Navigation/Navigation';
-import * as MapboxToken from '../libs/actions/MapboxToken';
+import reportPropTypes from '../pages/reportPropTypes';
+import DotIndicatorMessage from './DotIndicatorMessage';
+import * as ErrorUtils from '../libs/ErrorUtils';
+import usePrevious from '../hooks/usePrevious';
+import theme from '../styles/themes/default';
 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 LinearGradient from './LinearGradient';
+import DistanceMapView from './DistanceMapView';
 import * as Expensicons from './Icon/Expensicons';
-import BlockingView from './BlockingViews/BlockingView';
-import DotIndicatorMessage from './DotIndicatorMessage';
+import PendingMapView from './MapView/PendingMapView';
 import MenuItemWithTopDescription from './MenuItemWithTopDescription';
-import {iouPropTypes} from '../pages/iou/propTypes';
-import reportPropTypes from '../pages/reportPropTypes';
-import * as IOU from '../libs/actions/IOU';
 import * as StyleUtils from '../styles/StyleUtils';
+import transactionPropTypes from './transactionPropTypes';
+import ScreenWrapper from './ScreenWrapper';
+import FullPageNotFoundView from './BlockingViews/FullPageNotFoundView';
+import HeaderWithBackButton from './HeaderWithBackButton';
 
 const MAX_WAYPOINTS = 25;
 const MAX_WAYPOINTS_TO_DISPLAY = 4;
 
 const propTypes = {
-    /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
-    iou: iouPropTypes,
-
-    /** Type of money request (i.e. IOU) */
-    iouType: PropTypes.oneOf(_.values(CONST.IOU.MONEY_REQUEST_TYPE)),
+    /** The transactionID of this request */
+    transactionID: PropTypes.string,
 
     /** The report to which the distance request is associated */
     report: reportPropTypes,
 
-    /** The optimistic transaction for this request */
-    transaction: transactionPropTypes,
-
     /** Data about Mapbox token for calling Mapbox API */
     mapboxAccessToken: PropTypes.shape({
         /** Temporary token for Mapbox API */
@@ -63,26 +52,49 @@ const propTypes = {
         /** Time when the token will expire in ISO 8601 */
         expiration: PropTypes.string,
     }),
+
+    /** Are we editing an existing distance request, or creating a new one? */
+    isEditingRequest: PropTypes.bool,
+
+    /** Called on submit of this page */
+    onSubmit: PropTypes.func.isRequired,
+
+    /* Onyx Props */
+    transaction: transactionPropTypes,
+
+    /** 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 = {
-    iou: {},
-    iouType: '',
+    transactionID: '',
     report: {},
-    transaction: {},
+    isEditingRequest: false,
     mapboxAccessToken: {
         token: '',
     },
+    transaction: {},
 };
 
-function DistanceRequest({iou, iouType, report, transaction, mapboxAccessToken}) {
+function DistanceRequest({transactionID, report, transaction, mapboxAccessToken, route, isEditingRequest, onSubmit}) {
     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 iouType = lodashGet(route, 'params.iouType', '');
     const waypoints = useMemo(() => lodashGet(transaction, 'comment.waypoints', {}), [transaction]);
     const previousWaypoints = usePrevious(waypoints);
     const numberOfWaypoints = _.size(waypoints);
@@ -91,20 +103,23 @@ function DistanceRequest({iou, iouType, report, transaction, mapboxAccessToken})
 
     const lastWaypointIndex = numberOfWaypoints - 1;
     const isLoadingRoute = lodashGet(transaction, 'comment.isLoading', false);
-    const hasRouteError = lodashHas(transaction, 'errorFields.route');
-    const haveWaypointsChanged = !_.isEqual(previousWaypoints, waypoints);
-    const doesRouteExist = lodashHas(transaction, 'routes.route0.geometry.coordinates');
+    const isLoading = lodashGet(transaction, 'isLoading', false);
+    const hasRouteError = !!lodashGet(transaction, 'errorFields.route');
+    const hasRoute = TransactionUtils.hasRoute(transaction);
     const validatedWaypoints = TransactionUtils.getValidWaypoints(waypoints);
-    const shouldFetchRoute = (!doesRouteExist || haveWaypointsChanged) && !isLoadingRoute && _.size(validatedWaypoints) > 1;
+    const previousValidatedWaypoints = usePrevious(validatedWaypoints);
+    const haveValidatedWaypointsChanged = !_.isEqual(previousValidatedWaypoints, validatedWaypoints);
+    const isRouteAbsentWithoutErrors = !hasRoute && !hasRouteError;
+    const shouldFetchRoute = (isRouteAbsentWithoutErrors || haveValidatedWaypointsChanged) && !isLoadingRoute && _.size(validatedWaypoints) > 1;
     const waypointMarkers = useMemo(
         () =>
             _.filter(
                 _.map(waypoints, (waypoint, key) => {
-                    if (!waypoint || !lodashHas(waypoint, 'lat') || !lodashHas(waypoint, 'lng') || lodashIsNull(waypoint.lat) || lodashIsNull(waypoint.lng)) {
+                    if (!waypoint || lodashIsNil(waypoint.lat) || lodashIsNil(waypoint.lng)) {
                         return;
                     }
 
-                    const index = Number(key.replace('waypoint', ''));
+                    const index = TransactionUtils.getWaypointIndex(key);
                     let MarkerComponent;
                     if (index === 0) {
                         MarkerComponent = Expensicons.DotIndicatorUnfilled;
@@ -141,12 +156,12 @@ function DistanceRequest({iou, iouType, report, transaction, mapboxAccessToken})
     }, []);
 
     useEffect(() => {
-        if (!iou.transactionID || !_.isEmpty(waypoints)) {
+        if (!transactionID || !_.isEmpty(waypoints)) {
             return;
         }
         // Create the initial start and stop waypoints
-        Transaction.createInitialWaypoints(iou.transactionID);
-    }, [iou.transactionID, waypoints]);
+        Transaction.createInitialWaypoints(transactionID);
+    }, [transactionID, waypoints]);
 
     const updateGradientVisibility = (event = {}) => {
         // If a waypoint extends past the bottom of the visible area show the gradient, else hide it.
@@ -158,31 +173,45 @@ function DistanceRequest({iou, iouType, report, transaction, mapboxAccessToken})
             return;
         }
 
-        Transaction.getRoute(iou.transactionID, validatedWaypoints);
-    }, [shouldFetchRoute, iou.transactionID, validatedWaypoints, isOffline]);
+        Transaction.getRoute(transactionID, validatedWaypoints);
+    }, [shouldFetchRoute, 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.MONEY_REQUEST_CONFIRMATION.getRoute(iouType, reportID) : ROUTES.HOME);
+    };
+
+    /**
+     * Takes the user to the page for editing a specific waypoint
+     * @param {Number} index of the waypoint to edit
+     */
+    const navigateToWaypointEditPage = (index) => {
+        Navigation.navigate(isEditingRequest ? ROUTES.MONEY_REQUEST_EDIT_WAYPOINT.getRoute(report.reportID, transactionID, index) : ROUTES.MONEY_REQUEST_WAYPOINT.getRoute('request', index));
+    };
+
+    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}
                 >
                     {_.map(waypoints, (waypoint, key) => {
                         // key is of the form waypoint0, waypoint1, ...
-                        const index = Number(key.replace('waypoint', ''));
+                        const index = TransactionUtils.getWaypointIndex(key);
                         let descriptionKey = 'distance.waypointDescription.';
                         let waypointIcon;
                         if (index === 0) {
@@ -204,7 +233,7 @@ function DistanceRequest({iou, iouType, report, transaction, mapboxAccessToken})
                                 secondaryIcon={waypointIcon}
                                 secondaryIconFill={theme.icon}
                                 shouldShowRightIcon
-                                onPress={() => Navigation.navigate(ROUTES.getMoneyRequestWaypointRoute('request', index))}
+                                onPress={() => navigateToWaypointEditPage(index)}
                                 key={key}
                             />
                         );
@@ -228,7 +257,7 @@ function DistanceRequest({iou, iouType, report, transaction, mapboxAccessToken})
                 <Button
                     small
                     icon={Expensicons.Plus}
-                    onPress={() => Transaction.addStop(iou.transactionID)}
+                    onPress={() => navigateToWaypointEditPage(_.size(lodashGet(transaction, 'comment.waypoints', {})))}
                     text={translate('distance.addStop')}
                     isDisabled={numberOfWaypoints === MAX_WAYPOINTS}
                     innerStyles={[styles.ph10]}
@@ -236,7 +265,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,27 +277,49 @@ function DistanceRequest({iou, iouType, report, transaction, mapboxAccessToken})
                         style={styles.mapView}
                         waypoints={waypointMarkers}
                         styleURL={CONST.MAPBOX.STYLE_URL}
+                        overlayStyle={styles.m4}
                     />
                 ) : (
-                    <View style={[styles.mapPendingView]}>
-                        <BlockingView
-                            icon={Expensicons.EmptyStateRoutePending}
-                            title={translate('distance.mapPending.title')}
-                            subtitle={isOffline ? translate('distance.mapPending.subtitle') : translate('distance.mapPending.onlineSubtitle')}
-                            shouldShowLink={false}
-                        />
-                    </View>
+                    <PendingMapView
+                        title={translate('distance.mapPending.title')}
+                        subtitle={isOffline ? translate('distance.mapPending.subtitle') : translate('distance.mapPending.onlineSubtitle')}
+                    />
                 )}
             </View>
             <Button
                 success
                 style={[styles.w100, styles.mb4, styles.ph4, styles.flexShrink0]}
-                onPress={() => IOU.navigateToNextPage(iou, iouType, reportID, report)}
-                isDisabled={_.size(validatedWaypoints) < 2}
-                text={translate('common.next')}
+                onPress={() => onSubmit(waypoints)}
+                isDisabled={_.size(validatedWaypoints) < 2 || (!isOffline && (hasRouteError || isLoadingRoute || isLoading))}
+                text={translate(isEditingRequest ? 'common.save' : 'common.next')}
+                isLoading={!isOffline && (isLoadingRoute || shouldFetchRoute || isLoading)}
             />
         </ScrollView>
     );
+
+    if (!isEditing) {
+        return content;
+    }
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableKeyboardAvoidingView={false}
+            testID={DistanceRequest.displayName}
+        >
+            {({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';
@@ -276,7 +327,7 @@ DistanceRequest.propTypes = propTypes;
 DistanceRequest.defaultProps = defaultProps;
 export default withOnyx({
     transaction: {
-        key: (props) => `${ONYXKEYS.COLLECTION.TRANSACTION}${props.iou.transactionID}`,
+        key: ({transactionID}) => `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
     },
     mapboxAccessToken: {
         key: ONYXKEYS.MAPBOX_ACCESS_TOKEN,
diff --git a/src/components/DotIndicatorMessage.js b/src/components/DotIndicatorMessage.js
index ac550f34de3f..b3528b43dc75 100644
--- a/src/components/DotIndicatorMessage.js
+++ b/src/components/DotIndicatorMessage.js
@@ -5,7 +5,7 @@ import {View} from 'react-native';
 import styles from '../styles/styles';
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
-import colors from '../styles/colors';
+import themeColors from '../styles/themes/default';
 import Text from './Text';
 import * as Localize from '../libs/Localize';
 
@@ -57,7 +57,7 @@ function DotIndicatorMessage(props) {
             <View style={styles.offlineFeedback.errorDot}>
                 <Icon
                     src={Expensicons.DotIndicator}
-                    fill={props.type === 'error' ? colors.red : colors.green}
+                    fill={props.type === 'error' ? themeColors.danger : themeColors.success}
                 />
             </View>
             <View style={styles.offlineFeedback.textContainer}>
diff --git a/src/components/DownloadAppModal.js b/src/components/DownloadAppModal.js
deleted file mode 100644
index c96c6b3d28c0..000000000000
--- a/src/components/DownloadAppModal.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import React, {useState} from 'react';
-import PropTypes from 'prop-types';
-import {withOnyx} from 'react-native-onyx';
-import ONYXKEYS from '../ONYXKEYS';
-import styles from '../styles/styles';
-import CONST from '../CONST';
-import AppIcon from '../../assets/images/expensify-app-icon.svg';
-import useLocalize from '../hooks/useLocalize';
-import * as Link from '../libs/actions/Link';
-import * as Browser from '../libs/Browser';
-import getOperatingSystem from '../libs/getOperatingSystem';
-import setShowDownloadAppModal from '../libs/actions/DownloadAppModal';
-import ConfirmModal from './ConfirmModal';
-
-const propTypes = {
-    /** ONYX PROP to hide banner for a user that has dismissed it */
-    // eslint-disable-next-line react/forbid-prop-types
-    showDownloadAppBanner: PropTypes.bool,
-
-    /** Whether the user is logged in */
-    isAuthenticated: PropTypes.bool.isRequired,
-};
-
-const defaultProps = {
-    showDownloadAppBanner: true,
-};
-
-function DownloadAppModal({isAuthenticated, showDownloadAppBanner}) {
-    const [shouldShowBanner, setShouldShowBanner] = useState(Browser.isMobile() && isAuthenticated && showDownloadAppBanner);
-
-    const {translate} = useLocalize();
-
-    const handleCloseBanner = () => {
-        setShowDownloadAppModal(false);
-        setShouldShowBanner(false);
-    };
-
-    let link = '';
-
-    if (getOperatingSystem() === CONST.OS.IOS) {
-        link = CONST.APP_DOWNLOAD_LINKS.IOS;
-    } else if (getOperatingSystem() === CONST.OS.ANDROID) {
-        link = CONST.APP_DOWNLOAD_LINKS.ANDROID;
-    }
-
-    const handleOpenAppStore = () => {
-        setShowDownloadAppModal(false);
-        setShouldShowBanner(false);
-        Link.openExternalLink(link, true);
-    };
-
-    return (
-        <ConfirmModal
-            title={translate('DownloadAppModal.downloadTheApp')}
-            isVisible={shouldShowBanner}
-            onConfirm={handleOpenAppStore}
-            onCancel={handleCloseBanner}
-            prompt={translate('DownloadAppModal.keepTheConversationGoing')}
-            confirmText={translate('common.download')}
-            cancelText={translate('DownloadAppModal.noThanks')}
-            shouldCenterContent
-            iconSource={AppIcon}
-            promptStyles={[styles.textNormal, styles.lh20]}
-            titleStyles={[styles.textHeadline]}
-            iconAdditionalStyles={[styles.appIconBorderRadius]}
-            shouldStackButtons={false}
-        />
-    );
-}
-
-DownloadAppModal.displayName = 'DownloadAppModal';
-DownloadAppModal.propTypes = propTypes;
-DownloadAppModal.defaultProps = defaultProps;
-
-export default withOnyx({
-    showDownloadAppBanner: {
-        key: ONYXKEYS.SHOW_DOWNLOAD_APP_BANNER,
-    },
-})(DownloadAppModal);
diff --git a/src/components/EmojiPicker/EmojiPicker.js b/src/components/EmojiPicker/EmojiPicker.js
index 40d91ff03267..a12b089ddf97 100644
--- a/src/components/EmojiPicker/EmojiPicker.js
+++ b/src/components/EmojiPicker/EmojiPicker.js
@@ -114,9 +114,11 @@ const EmojiPicker = forwardRef((props, ref) => {
      */
     const isActive = (id) => Boolean(id) && id === activeID;
 
+    const clearActive = () => setActiveID(null);
+
     const resetEmojiPopoverAnchor = () => (emojiPopoverAnchor.current = null);
 
-    useImperativeHandle(ref, () => ({showEmojiPicker, isActive, hideEmojiPicker, isEmojiPickerVisible, resetEmojiPopoverAnchor}));
+    useImperativeHandle(ref, () => ({showEmojiPicker, isActive, clearActive, hideEmojiPicker, isEmojiPickerVisible, resetEmojiPopoverAnchor}));
 
     useEffect(() => {
         const emojiPopoverDimensionListener = Dimensions.addEventListener('change', () => {
diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.js b/src/components/EmojiPicker/EmojiPickerMenu/index.js
index 61f6981edbbe..444f0c58b914 100755
--- a/src/components/EmojiPicker/EmojiPickerMenu/index.js
+++ b/src/components/EmojiPicker/EmojiPickerMenu/index.js
@@ -109,7 +109,9 @@ class EmojiPickerMenu extends Component {
     }
 
     componentDidUpdate(prevProps) {
-        if (prevProps.frequentlyUsedEmojis === this.props.frequentlyUsedEmojis) return;
+        if (prevProps.frequentlyUsedEmojis === this.props.frequentlyUsedEmojis) {
+            return;
+        }
 
         const {filteredEmojis, headerEmojis, headerRowIndices} = this.getEmojisAndHeaderRowIndices();
         this.emojis = filteredEmojis;
diff --git a/src/components/EmojiPicker/EmojiPickerMenuItem/index.js b/src/components/EmojiPicker/EmojiPickerMenuItem/index.js
index 728e56792ddb..b51a8b07537c 100644
--- a/src/components/EmojiPicker/EmojiPickerMenuItem/index.js
+++ b/src/components/EmojiPicker/EmojiPickerMenuItem/index.js
@@ -72,15 +72,16 @@ class EmojiPickerMenuItem extends PureComponent {
             <PressableWithoutFeedback
                 shouldUseAutoHitSlop={false}
                 onPress={() => this.props.onPress(this.props.emoji)}
+                onPressOut={Browser.isMobile() ? this.props.onHoverOut : undefined}
                 onHoverIn={this.props.onHoverIn}
                 onHoverOut={this.props.onHoverOut}
                 onFocus={this.props.onFocus}
                 onBlur={this.props.onBlur}
                 ref={(ref) => (this.ref = ref)}
                 style={({pressed}) => [
-                    Browser.isMobile() && StyleUtils.getButtonBackgroundColorStyle(getButtonState(false, pressed)),
                     this.props.isHighlighted && this.props.isUsingKeyboardMovement ? styles.emojiItemKeyboardHighlighted : {},
                     this.props.isHighlighted && !this.props.isUsingKeyboardMovement ? styles.emojiItemHighlighted : {},
+                    Browser.isMobile() && StyleUtils.getButtonBackgroundColorStyle(getButtonState(false, pressed)),
                     styles.emojiItem,
                 ]}
                 accessibilityLabel={this.props.emoji}
diff --git a/src/components/EmojiSuggestions.js b/src/components/EmojiSuggestions.js
index b06b0cc63eb8..d7f7a8d6091a 100644
--- a/src/components/EmojiSuggestions.js
+++ b/src/components/EmojiSuggestions.js
@@ -40,9 +40,6 @@ const propTypes = {
      * 2.5 items. When this value is true, the height can be up to 5 items.  */
     isEmojiPickerLarge: PropTypes.bool.isRequired,
 
-    /** Show that we should include ReportRecipientLocalTime view height */
-    shouldIncludeReportRecipientLocalTimeHeight: PropTypes.bool.isRequired,
-
     /** Stores user's preferred skin tone */
     preferredSkinToneIndex: PropTypes.number.isRequired,
 
@@ -102,7 +99,6 @@ function EmojiSuggestions(props) {
             highlightedSuggestionIndex={props.highlightedEmojiIndex}
             onSelect={props.onSelect}
             isSuggestionPickerLarge={props.isEmojiPickerLarge}
-            shouldIncludeReportRecipientLocalTimeHeight={props.shouldIncludeReportRecipientLocalTimeHeight}
             accessibilityLabelExtractor={keyExtractor}
             measureParentContainer={props.measureParentContainer}
         />
diff --git a/src/components/ErrorBoundary/BaseErrorBoundary.js b/src/components/ErrorBoundary/BaseErrorBoundary.js
index e479b04f7ade..d626442e81dd 100644
--- a/src/components/ErrorBoundary/BaseErrorBoundary.js
+++ b/src/components/ErrorBoundary/BaseErrorBoundary.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import {ErrorBoundary} from 'react-error-boundary';
 import BootSplash from '../../libs/BootSplash';
 import GenericErrorPage from '../../pages/ErrorPage/GenericErrorPage';
 
@@ -22,40 +23,27 @@ const defaultProps = {
  * This component captures an error in the child component tree and logs it to the server
  * It can be used to wrap the entire app as well as to wrap specific parts for more granularity
  * @see {@link https://reactjs.org/docs/error-boundaries.html#where-to-place-error-boundaries}
+ * @return {React.Component}
  */
-class BaseErrorBoundary extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {hasError: false};
-        this.clearError = this.clearError.bind(this);
-    }
-
-    static getDerivedStateFromError() {
-        // Update state so the next render will show the fallback UI.
-        return {hasError: true};
-    }
-
-    componentDidCatch(error, errorInfo) {
-        this.props.logError(this.props.errorMessage, error, JSON.stringify(errorInfo));
-
+function BaseErrorBoundary({logError, errorMessage, children}) {
+    const catchError = (error, errorInfo) => {
+        logError(errorMessage, error, JSON.stringify(errorInfo));
         // We hide the splash screen since the error might happened during app init
         BootSplash.hide();
-    }
-
-    clearError() {
-        this.setState({hasError: false});
-    }
-
-    render() {
-        if (this.state.hasError) {
-            return <GenericErrorPage onRefresh={this.clearError} />;
-        }
-
-        return this.props.children;
-    }
+    };
+
+    return (
+        <ErrorBoundary
+            fallback={<GenericErrorPage />}
+            onError={catchError}
+        >
+            {children}
+        </ErrorBoundary>
+    );
 }
 
 BaseErrorBoundary.propTypes = propTypes;
 BaseErrorBoundary.defaultProps = defaultProps;
+BaseErrorBoundary.displayName = 'BaseErrorBoundary';
 
 export default BaseErrorBoundary;
diff --git a/src/components/ExceededCommentLength.js b/src/components/ExceededCommentLength.js
index 2aa50779e10f..9c785cec0395 100644
--- a/src/components/ExceededCommentLength.js
+++ b/src/components/ExceededCommentLength.js
@@ -4,6 +4,7 @@ import {debounce} from 'lodash';
 import {withOnyx} from 'react-native-onyx';
 import CONST from '../CONST';
 import * as ReportUtils from '../libs/ReportUtils';
+import useLocalize from '../hooks/useLocalize';
 import Text from './Text';
 import styles from '../styles/styles';
 import ONYXKEYS from '../ONYXKEYS';
@@ -25,6 +26,7 @@ const defaultProps = {
 };
 
 function ExceededCommentLength(props) {
+    const {numberFormat, translate} = useLocalize();
     const [commentLength, setCommentLength] = useState(0);
     const updateCommentLength = useMemo(
         () =>
@@ -44,7 +46,14 @@ function ExceededCommentLength(props) {
         return null;
     }
 
-    return <Text style={[styles.textMicro, styles.textDanger, styles.chatItemComposeSecondaryRow, styles.mlAuto, styles.pl2]}>{`${commentLength}/${CONST.MAX_COMMENT_LENGTH}`}</Text>;
+    return (
+        <Text
+            style={[styles.textMicro, styles.textDanger, styles.chatItemComposeSecondaryRow, styles.mlAuto, styles.pl2]}
+            numberOfLines={1}
+        >
+            {translate('composer.commentExceededMaxLength', {formattedMaxLength: numberFormat(CONST.MAX_COMMENT_LENGTH)})}
+        </Text>
+    );
 }
 
 ExceededCommentLength.propTypes = propTypes;
@@ -54,5 +63,6 @@ ExceededCommentLength.displayName = 'ExceededCommentLength';
 export default withOnyx({
     comment: {
         key: ({reportID}) => `${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`,
+        initialValue: '',
     },
 })(ExceededCommentLength);
diff --git a/src/components/Form.js b/src/components/Form.js
index c7c778168274..ef6c3ea10474 100644
--- a/src/components/Form.js
+++ b/src/components/Form.js
@@ -140,8 +140,33 @@ function Form(props) {
 
             // Validate the input for html tags. It should supercede any other error
             _.each(trimmedStringValues, (inputValue, inputID) => {
-                // Return early if there is no value OR the value is not a string OR there are no HTML characters
-                if (!inputValue || !_.isString(inputValue) || inputValue.search(CONST.VALIDATE_FOR_HTML_TAG_REGEX) === -1) {
+                // If the input value is empty OR is non-string, we don't need to validate it for HTML tags
+                if (!inputValue || !_.isString(inputValue)) {
+                    return;
+                }
+                const foundHtmlTagIndex = inputValue.search(CONST.VALIDATE_FOR_HTML_TAG_REGEX);
+                const leadingSpaceIndex = inputValue.search(CONST.VALIDATE_FOR_LEADINGSPACES_HTML_TAG_REGEX);
+
+                // Return early if there are no HTML characters
+                if (leadingSpaceIndex === -1 && foundHtmlTagIndex === -1) {
+                    return;
+                }
+
+                const matchedHtmlTags = inputValue.match(CONST.VALIDATE_FOR_HTML_TAG_REGEX);
+                let isMatch = _.some(CONST.WHITELISTED_TAGS, (r) => r.test(inputValue));
+                // Check for any matches that the original regex (foundHtmlTagIndex) matched
+                if (matchedHtmlTags) {
+                    // Check if any matched inputs does not match in WHITELISTED_TAGS list and return early if needed.
+                    for (let i = 0; i < matchedHtmlTags.length; i++) {
+                        const htmlTag = matchedHtmlTags[i];
+                        isMatch = _.some(CONST.WHITELISTED_TAGS, (r) => r.test(htmlTag));
+                        if (!isMatch) {
+                            break;
+                        }
+                    }
+                }
+
+                if (isMatch && leadingSpaceIndex === -1) {
                     return;
                 }
 
diff --git a/src/components/Form/FormContext.js b/src/components/Form/FormContext.js
new file mode 100644
index 000000000000..40edaa7cca69
--- /dev/null
+++ b/src/components/Form/FormContext.js
@@ -0,0 +1,4 @@
+import {createContext} from 'react';
+
+const FormContext = createContext({});
+export default FormContext;
diff --git a/src/components/Form/FormProvider.js b/src/components/Form/FormProvider.js
new file mode 100644
index 000000000000..5261d1258ad0
--- /dev/null
+++ b/src/components/Form/FormProvider.js
@@ -0,0 +1,262 @@
+import React, {createRef, useCallback, useMemo, useRef, useState} from 'react';
+import _ from 'underscore';
+import {withOnyx} from 'react-native-onyx';
+import PropTypes from 'prop-types';
+import lodashGet from 'lodash/get';
+import Visibility from '../../libs/Visibility';
+import * as FormActions from '../../libs/actions/FormActions';
+import FormContext from './FormContext';
+import FormWrapper from './FormWrapper';
+import compose from '../../libs/compose';
+import {withNetwork} from '../OnyxProvider';
+import stylePropTypes from '../../styles/stylePropTypes';
+import networkPropTypes from '../networkPropTypes';
+
+const propTypes = {
+    /** A unique Onyx key identifying the form */
+    formID: PropTypes.string.isRequired,
+
+    /** Text to be displayed in the submit button */
+    submitButtonText: PropTypes.string.isRequired,
+
+    /** Controls the submit button's visibility */
+    isSubmitButtonVisible: PropTypes.bool,
+
+    /** Callback to validate the form */
+    validate: PropTypes.func,
+
+    /** Callback to submit the form */
+    onSubmit: PropTypes.func.isRequired,
+
+    /** Children to render. */
+    children: PropTypes.oneOfType([PropTypes.func, PropTypes.node]).isRequired,
+
+    /* Onyx Props */
+
+    /** Contains the form state that must be accessed outside of the component */
+    formState: PropTypes.shape({
+        /** Controls the loading state of the form */
+        isLoading: PropTypes.bool,
+
+        /** Server side errors keyed by microtime */
+        errors: PropTypes.objectOf(PropTypes.string),
+
+        /** Field-specific server side errors keyed by microtime */
+        errorFields: PropTypes.objectOf(PropTypes.objectOf(PropTypes.string)),
+    }),
+
+    /** Should the button be enabled when offline */
+    enabledWhenOffline: PropTypes.bool,
+
+    /** Whether the form submit action is dangerous */
+    isSubmitActionDangerous: PropTypes.bool,
+
+    /** Whether ScrollWithContext should be used instead of regular ScrollView.
+     *  Set to true when there's a nested Picker component in Form.
+     */
+    scrollContextEnabled: PropTypes.bool,
+
+    /** Container styles */
+    style: stylePropTypes,
+
+    /** Custom content to display in the footer after submit button */
+    footerContent: PropTypes.oneOfType([PropTypes.func, PropTypes.node]),
+
+    /** Information about the network */
+    network: networkPropTypes.isRequired,
+
+    shouldValidateOnBlur: PropTypes.bool,
+
+    shouldValidateOnChange: PropTypes.bool,
+};
+
+const defaultProps = {
+    isSubmitButtonVisible: true,
+    formState: {
+        isLoading: false,
+    },
+    enabledWhenOffline: false,
+    isSubmitActionDangerous: false,
+    scrollContextEnabled: false,
+    footerContent: null,
+    style: [],
+    validate: () => {},
+    shouldValidateOnBlur: true,
+    shouldValidateOnChange: true,
+};
+
+function getInitialValueByType(valueType) {
+    switch (valueType) {
+        case 'string':
+            return '';
+        case 'boolean':
+            return false;
+        case 'date':
+            return new Date();
+        default:
+            return '';
+    }
+}
+
+function FormProvider({validate, shouldValidateOnBlur, shouldValidateOnChange, children, formState, network, enabledWhenOffline, onSubmit, ...rest}) {
+    const inputRefs = useRef(null);
+    const touchedInputs = useRef({});
+    const [inputValues, setInputValues] = useState({});
+    const [errors, setErrors] = useState({});
+
+    const onValidate = useCallback(
+        (values) => {
+            const validateErrors = validate(values);
+            setErrors(validateErrors);
+            return validateErrors;
+        },
+        [validate],
+    );
+
+    /**
+     * @param {String} inputID - The inputID of the input being touched
+     */
+    const setTouchedInput = useCallback(
+        (inputID) => {
+            touchedInputs.current[inputID] = true;
+        },
+        [touchedInputs],
+    );
+
+    const submit = useCallback(() => {
+        // Return early if the form is already submitting to avoid duplicate submission
+        if (formState.isLoading) {
+            return;
+        }
+
+        // Touches all form inputs so we can validate the entire form
+        _.each(inputRefs.current, (inputRef, inputID) => (touchedInputs.current[inputID] = true));
+
+        // Validate form and return early if any errors are found
+        if (!_.isEmpty(onValidate(inputValues))) {
+            return;
+        }
+
+        // Do not submit form if network is offline and the form is not enabled when offline
+        if (network.isOffline && !enabledWhenOffline) {
+            return;
+        }
+
+        onSubmit(inputValues);
+    }, [enabledWhenOffline, formState.isLoading, inputValues, network.isOffline, onSubmit, onValidate]);
+
+    const registerInput = useCallback(
+        (inputID, propsToParse = {}) => {
+            const newRef = propsToParse.ref || createRef();
+            inputRefs[inputID] = newRef;
+
+            if (!_.isUndefined(propsToParse.value)) {
+                inputValues[inputID] = propsToParse.value;
+            } else if (propsToParse.shouldUseDefaultValue) {
+                // We force the form to set the input value from the defaultValue props if there is a saved valid value
+                inputValues[inputID] = propsToParse.defaultValue;
+            } else if (_.isUndefined(inputValues[inputID])) {
+                // We want to initialize the input value if it's undefined
+                inputValues[inputID] = _.isUndefined(propsToParse.defaultValue) ? getInitialValueByType(propsToParse.valueType) : propsToParse.defaultValue;
+            }
+
+            const errorFields = lodashGet(formState, 'errorFields', {});
+            const fieldErrorMessage =
+                _.chain(errorFields[inputID])
+                    .keys()
+                    .sortBy()
+                    .reverse()
+                    .map((key) => errorFields[inputID][key])
+                    .first()
+                    .value() || '';
+
+            return {
+                ...propsToParse,
+                ref: newRef,
+                inputID,
+                key: propsToParse.key || inputID,
+                errorText: errors[inputID] || fieldErrorMessage,
+                value: inputValues[inputID],
+                // As the text input is controlled, we never set the defaultValue prop
+                // as this is already happening by the value prop.
+                defaultValue: undefined,
+                onTouched: (event) => {
+                    setTouchedInput(inputID);
+                    if (_.isFunction(propsToParse.onTouched)) {
+                        propsToParse.onTouched(event);
+                    }
+                },
+                onBlur: (event) => {
+                    // Only run validation when user proactively blurs the input.
+                    if (Visibility.isVisible() && Visibility.hasFocus()) {
+                        // We delay the validation in order to prevent Checkbox loss of focus when
+                        // the user is focusing a TextInput and proceeds to toggle a CheckBox in
+                        // web and mobile web platforms.
+                        setTimeout(() => {
+                            setTouchedInput(inputID);
+                            if (shouldValidateOnBlur) {
+                                onValidate(inputValues);
+                            }
+                        }, 200);
+                    }
+
+                    if (_.isFunction(propsToParse.onBlur)) {
+                        propsToParse.onBlur(event);
+                    }
+                },
+                onInputChange: (value, key) => {
+                    const inputKey = key || inputID;
+                    setInputValues((prevState) => {
+                        const newState = {
+                            ...prevState,
+                            [inputKey]: value,
+                        };
+
+                        if (shouldValidateOnChange) {
+                            onValidate(newState);
+                        }
+                        return newState;
+                    });
+
+                    if (propsToParse.shouldSaveDraft) {
+                        FormActions.setDraftValues(propsToParse.formID, {[inputKey]: value});
+                    }
+
+                    if (_.isFunction(propsToParse.onValueChange)) {
+                        propsToParse.onValueChange(value, inputKey);
+                    }
+                },
+            };
+        },
+        [errors, formState, inputValues, onValidate, setTouchedInput, shouldValidateOnBlur, shouldValidateOnChange],
+    );
+    const value = useMemo(() => ({registerInput}), [registerInput]);
+
+    return (
+        <FormContext.Provider value={value}>
+            {/* eslint-disable react/jsx-props-no-spreading */}
+            <FormWrapper
+                {...rest}
+                onSubmit={submit}
+                inputRefs={inputRefs}
+                errors={errors}
+                enabledWhenOffline={enabledWhenOffline}
+            >
+                {children}
+            </FormWrapper>
+        </FormContext.Provider>
+    );
+}
+
+FormProvider.displayName = 'Form';
+FormProvider.propTypes = propTypes;
+FormProvider.defaultProps = defaultProps;
+
+export default compose(
+    withNetwork(),
+    withOnyx({
+        formState: {
+            key: (props) => props.formID,
+        },
+    }),
+)(FormProvider);
diff --git a/src/components/Form/FormWrapper.js b/src/components/Form/FormWrapper.js
new file mode 100644
index 000000000000..44bfee1a9e4a
--- /dev/null
+++ b/src/components/Form/FormWrapper.js
@@ -0,0 +1,193 @@
+import React, {useCallback, useMemo, useRef} from 'react';
+import {Keyboard, ScrollView, StyleSheet} from 'react-native';
+import _ from 'underscore';
+import PropTypes from 'prop-types';
+import {withOnyx} from 'react-native-onyx';
+import * as ErrorUtils from '../../libs/ErrorUtils';
+import FormSubmit from '../FormSubmit';
+import FormAlertWithSubmitButton from '../FormAlertWithSubmitButton';
+import styles from '../../styles/styles';
+import SafeAreaConsumer from '../SafeAreaConsumer';
+import ScrollViewWithContext from '../ScrollViewWithContext';
+
+import stylePropTypes from '../../styles/stylePropTypes';
+
+const propTypes = {
+    /** A unique Onyx key identifying the form */
+    formID: PropTypes.string.isRequired,
+
+    /** Text to be displayed in the submit button */
+    submitButtonText: PropTypes.string.isRequired,
+
+    /** Controls the submit button's visibility */
+    isSubmitButtonVisible: PropTypes.bool,
+
+    /** Callback to submit the form */
+    onSubmit: PropTypes.func.isRequired,
+
+    /** Children to render. */
+    children: PropTypes.oneOfType([PropTypes.func, PropTypes.node]).isRequired,
+
+    /* Onyx Props */
+
+    /** Contains the form state that must be accessed outside of the component */
+    formState: PropTypes.shape({
+        /** Controls the loading state of the form */
+        isLoading: PropTypes.bool,
+
+        /** Server side errors keyed by microtime */
+        errors: PropTypes.objectOf(PropTypes.oneOf([PropTypes.string, PropTypes.arrayOf(PropTypes.string)])),
+
+        /** Field-specific server side errors keyed by microtime */
+        errorFields: PropTypes.objectOf(PropTypes.objectOf(PropTypes.string)),
+    }),
+
+    /** Should the button be enabled when offline */
+    enabledWhenOffline: PropTypes.bool,
+
+    /** Whether the form submit action is dangerous */
+    isSubmitActionDangerous: PropTypes.bool,
+
+    /** Whether ScrollWithContext should be used instead of regular ScrollView.
+     *  Set to true when there's a nested Picker component in Form.
+     */
+    scrollContextEnabled: PropTypes.bool,
+
+    /** Container styles */
+    style: stylePropTypes,
+
+    /** Custom content to display in the footer after submit button */
+    footerContent: PropTypes.oneOfType([PropTypes.func, PropTypes.node]),
+
+    errors: PropTypes.objectOf(PropTypes.string).isRequired,
+
+    inputRefs: PropTypes.objectOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object])).isRequired,
+};
+
+const defaultProps = {
+    isSubmitButtonVisible: true,
+    formState: {
+        isLoading: false,
+    },
+    enabledWhenOffline: false,
+    isSubmitActionDangerous: false,
+    scrollContextEnabled: false,
+    footerContent: null,
+    style: [],
+};
+
+function FormWrapper(props) {
+    const {onSubmit, children, formState, errors, inputRefs, submitButtonText, footerContent, isSubmitButtonVisible, style, enabledWhenOffline, isSubmitActionDangerous, formID} = props;
+    const formRef = useRef(null);
+    const formContentRef = useRef(null);
+    const errorMessage = useMemo(() => {
+        const latestErrorMessage = ErrorUtils.getLatestErrorMessage(formState);
+        return typeof latestErrorMessage === 'string' ? latestErrorMessage : '';
+    }, [formState]);
+
+    const scrollViewContent = useCallback(
+        (safeAreaPaddingBottomStyle) => (
+            <FormSubmit
+                key={formID}
+                ref={formContentRef}
+                style={StyleSheet.flatten([style, safeAreaPaddingBottomStyle])}
+                onSubmit={onSubmit}
+            >
+                {children}
+                {isSubmitButtonVisible && (
+                    <FormAlertWithSubmitButton
+                        buttonText={submitButtonText}
+                        isAlertVisible={_.size(errors) > 0 || Boolean(errorMessage) || !_.isEmpty(formState.errorFields)}
+                        isLoading={formState.isLoading}
+                        message={_.isEmpty(formState.errorFields) ? errorMessage : null}
+                        onSubmit={onSubmit}
+                        footerContent={footerContent}
+                        onFixTheErrorsLinkPressed={() => {
+                            const errorFields = !_.isEmpty(errors) ? errors : formState.errorFields;
+                            const focusKey = _.find(_.keys(inputRefs), (key) => _.keys(errorFields).includes(key));
+                            const focusInput = inputRefs[focusKey].current;
+
+                            // Dismiss the keyboard for non-text fields by checking if the component has the isFocused method, as only TextInput has this method.
+                            if (typeof focusInput.isFocused !== 'function') {
+                                Keyboard.dismiss();
+                            }
+
+                            // We subtract 10 to scroll slightly above the input
+                            if (focusInput.measureLayout && typeof focusInput.measureLayout === 'function') {
+                                // We measure relative to the content root, not the scroll view, as that gives
+                                // consistent results across mobile and web
+                                focusInput.measureLayout(formContentRef.current, (x, y) =>
+                                    formRef.current.scrollTo({
+                                        y: y - 10,
+                                        animated: false,
+                                    }),
+                                );
+                            }
+
+                            // Focus the input after scrolling, as on the Web it gives a slightly better visual result
+                            if (focusInput.focus && typeof focusInput.focus === 'function') {
+                                focusInput.focus();
+                            }
+                        }}
+                        containerStyles={[styles.mh0, styles.mt5, styles.flex1]}
+                        enabledWhenOffline={enabledWhenOffline}
+                        isSubmitActionDangerous={isSubmitActionDangerous}
+                        disablePressOnEnter
+                    />
+                )}
+            </FormSubmit>
+        ),
+        [
+            children,
+            enabledWhenOffline,
+            errorMessage,
+            errors,
+            footerContent,
+            formID,
+            formState.errorFields,
+            formState.isLoading,
+            inputRefs,
+            isSubmitActionDangerous,
+            isSubmitButtonVisible,
+            onSubmit,
+            style,
+            submitButtonText,
+        ],
+    );
+
+    return (
+        <SafeAreaConsumer>
+            {({safeAreaPaddingBottomStyle}) =>
+                props.scrollContextEnabled ? (
+                    <ScrollViewWithContext
+                        style={[styles.w100, styles.flex1]}
+                        contentContainerStyle={styles.flexGrow1}
+                        keyboardShouldPersistTaps="handled"
+                        ref={formRef}
+                    >
+                        {scrollViewContent(safeAreaPaddingBottomStyle)}
+                    </ScrollViewWithContext>
+                ) : (
+                    <ScrollView
+                        style={[styles.w100, styles.flex1]}
+                        contentContainerStyle={styles.flexGrow1}
+                        keyboardShouldPersistTaps="handled"
+                        ref={formRef}
+                    >
+                        {scrollViewContent(safeAreaPaddingBottomStyle)}
+                    </ScrollView>
+                )
+            }
+        </SafeAreaConsumer>
+    );
+}
+
+FormWrapper.displayName = 'FormWrapper';
+FormWrapper.propTypes = propTypes;
+FormWrapper.defaultProps = defaultProps;
+
+export default withOnyx({
+    formState: {
+        key: (props) => props.formID,
+    },
+})(FormWrapper);
diff --git a/src/components/Form/InputWrapper.js b/src/components/Form/InputWrapper.js
new file mode 100644
index 000000000000..43064b5a6690
--- /dev/null
+++ b/src/components/Form/InputWrapper.js
@@ -0,0 +1,34 @@
+import React, {forwardRef, useContext} from 'react';
+import PropTypes from 'prop-types';
+import FormContext from './FormContext';
+
+const propTypes = {
+    InputComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.elementType]).isRequired,
+    inputID: PropTypes.string.isRequired,
+    valueType: PropTypes.string,
+    forwardedRef: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({current: PropTypes.instanceOf(React.Component)})]),
+};
+
+const defaultProps = {
+    forwardedRef: undefined,
+    valueType: 'string',
+};
+
+function InputWrapper(props) {
+    const {InputComponent, inputID, forwardedRef, ...rest} = props;
+    const {registerInput} = useContext(FormContext);
+    // eslint-disable-next-line react/jsx-props-no-spreading
+    return <InputComponent {...registerInput(inputID, {ref: forwardedRef, ...rest})} />;
+}
+
+InputWrapper.propTypes = propTypes;
+InputWrapper.defaultProps = defaultProps;
+InputWrapper.displayName = 'InputWrapper';
+
+export default forwardRef((props, ref) => (
+    <InputWrapper
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...props}
+        forwardedRef={ref}
+    />
+));
diff --git a/src/components/FormHelpMessage.js b/src/components/FormHelpMessage.js
index df8befe5af30..f7366f8dfef6 100644
--- a/src/components/FormHelpMessage.js
+++ b/src/components/FormHelpMessage.js
@@ -5,7 +5,7 @@ import {View} from 'react-native';
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
 import Text from './Text';
-import colors from '../styles/colors';
+import themeColors from '../styles/themes/default';
 import styles from '../styles/styles';
 import stylePropTypes from '../styles/stylePropTypes';
 import * as Localize from '../libs/Localize';
@@ -42,7 +42,7 @@ function FormHelpMessage(props) {
             {props.isError && (
                 <Icon
                     src={Expensicons.DotIndicator}
-                    fill={colors.red}
+                    fill={themeColors.danger}
                 />
             )}
             <View style={[styles.flex1, props.isError && styles.ml2]}>
diff --git a/src/components/GrowlNotification/index.js b/src/components/GrowlNotification/index.js
index 60bd1bf00587..a06185ac3320 100644
--- a/src/components/GrowlNotification/index.js
+++ b/src/components/GrowlNotification/index.js
@@ -1,7 +1,7 @@
 import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
 import {Directions, FlingGestureHandler, State} from 'react-native-gesture-handler';
 import {View, Animated} from 'react-native';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
 import Text from '../Text';
 import Icon from '../Icon';
 import * as Expensicons from '../Icon/Expensicons';
@@ -10,19 +10,20 @@ import GrowlNotificationContainer from './GrowlNotificationContainer';
 import CONST from '../../CONST';
 import * as Growl from '../../libs/Growl';
 import * as Pressables from '../Pressable';
+import useNativeDriver from '../../libs/useNativeDriver';
 
 const types = {
     [CONST.GROWL.SUCCESS]: {
         icon: Expensicons.Checkmark,
-        iconColor: colors.green,
+        iconColor: themeColors.success,
     },
     [CONST.GROWL.ERROR]: {
         icon: Expensicons.Exclamation,
-        iconColor: colors.red,
+        iconColor: themeColors.danger,
     },
     [CONST.GROWL.WARNING]: {
         icon: Expensicons.Exclamation,
-        iconColor: colors.yellow,
+        iconColor: themeColors.warning,
     },
 };
 
@@ -59,7 +60,7 @@ function GrowlNotification(_, ref) {
             Animated.spring(translateY, {
                 toValue: val,
                 duration: 80,
-                useNativeDriver: true,
+                useNativeDriver,
             }).start();
         },
         [translateY],
diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js
index 5417f7af6820..bba62cc4f4e0 100755
--- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js
+++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js
@@ -6,6 +6,7 @@ import htmlRenderers from './HTMLRenderers';
 import * as HTMLEngineUtils from './htmlEngineUtils';
 import styles from '../../styles/styles';
 import fontFamily from '../../styles/fontFamily';
+import convertToLTR from '../../libs/convertToLTR';
 
 const propTypes = {
     /** Whether text elements should be selectable */
@@ -57,7 +58,7 @@ const defaultViewProps = {style: [styles.alignItemsStart, styles.userSelectText]
 // costly invalidations and commits.
 function BaseHTMLEngineProvider(props) {
     // We need to memoize this prop to make it referentially stable.
-    const defaultTextProps = useMemo(() => ({selectable: props.textSelectable, allowFontScaling: false}), [props.textSelectable]);
+    const defaultTextProps = useMemo(() => ({selectable: props.textSelectable, allowFontScaling: false, textBreakStrategy: 'simple'}), [props.textSelectable]);
 
     // We need to pass multiple system-specific fonts for emojis but
     // we can't apply multiple fonts at once so we need to pass fallback fonts.
@@ -71,6 +72,10 @@ function BaseHTMLEngineProvider(props) {
             enableCSSInlineProcessing={false}
             systemFonts={_.values(fontFamily)}
             fallbackFonts={fallbackFonts}
+            domVisitors={{
+                // eslint-disable-next-line no-param-reassign
+                onText: (text) => (text.data = convertToLTR(text.data)),
+            }}
         >
             <RenderHTMLConfigProvider
                 defaultTextProps={defaultTextProps}
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js
index f8c5bbc066a6..92a313cf1e0a 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js
@@ -44,7 +44,7 @@ function AnchorRenderer(props) {
         // the reportID is extracted from the URL and then opened as an internal link, taking the user straight to the chat in the same tab.
         if (hasExpensifyOrigin && attrHref.indexOf('newdotreport?reportID=') > -1) {
             const reportID = attrHref.split('newdotreport?reportID=').pop();
-            const reportRoute = ROUTES.getReportRoute(reportID);
+            const reportRoute = ROUTES.REPORT_WITH_ID.getRoute(reportID);
             Navigation.navigate(reportRoute);
             return;
         }
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js
index d91510c3ec6a..a0b6b0dadf9f 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.js
@@ -1,5 +1,6 @@
 import _ from 'underscore';
 import React from 'react';
+import CONST from '../../../CONST';
 import htmlRendererPropTypes from './htmlRendererPropTypes';
 import withLocalize, {withLocalizePropTypes} from '../../withLocalize';
 import Text from '../../Text';
@@ -17,21 +18,23 @@ function EditedRenderer(props) {
     const defaultRendererProps = _.omit(props, ['TDefaultRenderer', 'style', 'tnode']);
     const isPendingDelete = Boolean(props.tnode.attributes.deleted !== undefined);
     return (
-        <Text
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...defaultRendererProps}
-            fontSize={variables.fontSizeSmall}
-            color={themeColors.textSupporting}
-            style={[editedLabelStyles, isPendingDelete && styles.offlineFeedback.deleted]}
-        >
-            {/* Native devices do not support margin between nested text */}
+        <Text>
             <Text
                 selectable={false}
-                style={[styles.w1, styles.userSelectNone]}
+                style={styles.userSelectNone}
+                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
             >
                 {' '}
             </Text>
-            {props.translate('reportActionCompose.edited')}
+            <Text
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...defaultRendererProps}
+                fontSize={variables.fontSizeSmall}
+                color={themeColors.textSupporting}
+                style={[editedLabelStyles, isPendingDelete && styles.offlineFeedback.deleted]}
+            >
+                {props.translate('reportActionCompose.edited')}
+            </Text>
         </Text>
     );
 }
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.js
index bfe39459ed74..f5fac7b49e0f 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:
@@ -57,7 +62,7 @@ function ImageRenderer(props) {
                 <PressableWithoutFocus
                     style={[styles.noOutline]}
                     onPress={() => {
-                        const route = ROUTES.getReportAttachmentRoute(report.reportID, source);
+                        const route = ROUTES.REPORT_ATTACHMENTS.getRoute(report.reportID, source);
                         Navigation.navigate(route);
                     }}
                     onLongPress={(event) =>
@@ -72,7 +77,7 @@ function ImageRenderer(props) {
                         )
                     }
                     accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
-                    accessibilityLabel={props.translate('accessibilityHints.viewAttachment')}
+                    accessibilityLabel={translate('accessibilityHints.viewAttachment')}
                 >
                     <ThumbnailImage
                         previewSourceURL={previewSource}
@@ -90,4 +95,15 @@ function ImageRenderer(props) {
 ImageRenderer.propTypes = propTypes;
 ImageRenderer.displayName = 'ImageRenderer';
 
-export default withLocalize(ImageRenderer);
+export default withOnyx({
+    user: {
+        key: ONYXKEYS.USER,
+    },
+})(
+    memo(
+        ImageRenderer,
+        (prevProps, nextProps) =>
+            lodashGet(prevProps, 'tnode.attributes') === lodashGet(nextProps, 'tnode.attributes') &&
+            lodashGet(prevProps, 'user.shouldUseStagingServer') === lodashGet(nextProps, 'user.shouldUseStagingServer'),
+    ),
+);
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.js
index 7f7753dfea44..812f4e951f74 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.js
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.js
@@ -1,6 +1,8 @@
 import React from 'react';
 import _ from 'underscore';
 import {TNodeChildrenRenderer} from 'react-native-render-html';
+import {withOnyx} from 'react-native-onyx';
+import lodashGet from 'lodash/get';
 import Navigation from '../../../libs/Navigation/Navigation';
 import ROUTES from '../../../ROUTES';
 import Text from '../../Text';
@@ -10,52 +12,67 @@ import withCurrentUserPersonalDetails from '../../withCurrentUserPersonalDetails
 import personalDetailsPropType from '../../../pages/personalDetailsPropType';
 import * as StyleUtils from '../../../styles/StyleUtils';
 import * as PersonalDetailsUtils from '../../../libs/PersonalDetailsUtils';
+import compose from '../../../libs/compose';
 import TextLink from '../../TextLink';
+import ONYXKEYS from '../../../ONYXKEYS';
+import useLocalize from '../../../hooks/useLocalize';
+import CONST from '../../../CONST';
 
 const propTypes = {
     ...htmlRendererPropTypes,
 
-    /**
-     * Current user personal details
-     */
+    /** Current user personal details */
     currentUserPersonalDetails: personalDetailsPropType.isRequired,
-};
 
-/**
- * Navigates to user details screen based on email
- * @param {String} email
- * @returns {void}
- * */
-const showUserDetails = (email) => Navigation.navigate(ROUTES.getDetailsRoute(email));
+    /** Personal details of all users */
+    personalDetails: personalDetailsPropType.isRequired,
+};
 
 function MentionUserRenderer(props) {
+    const {translate} = useLocalize();
     const defaultRendererProps = _.omit(props, ['TDefaultRenderer', 'style']);
+    const htmlAttribAccountID = lodashGet(props.tnode.attributes, 'accountid');
+
+    let accountID;
+    let displayNameOrLogin;
+    let navigationRoute;
 
-    // We need to remove the leading @ from data as it is not part of the login
-    const loginWithoutLeadingAt = props.tnode.data ? props.tnode.data.slice(1) : '';
+    if (!_.isEmpty(htmlAttribAccountID)) {
+        const user = lodashGet(props.personalDetails, htmlAttribAccountID);
+        accountID = parseInt(htmlAttribAccountID, 10);
+        displayNameOrLogin = lodashGet(user, 'login', '') || lodashGet(user, 'displayName', '') || translate('common.hidden');
+        navigationRoute = ROUTES.PROFILE.getRoute(htmlAttribAccountID);
+    } else if (!_.isEmpty(props.tnode.data)) {
+        // We need to remove the LTR unicode and leading @ from data as it is not part of the login
+        displayNameOrLogin = props.tnode.data.replace(CONST.UNICODE.LTR, '').slice(1);
 
-    const accountID = _.first(PersonalDetailsUtils.getAccountIDsByLogins([loginWithoutLeadingAt]));
+        accountID = _.first(PersonalDetailsUtils.getAccountIDsByLogins([displayNameOrLogin]));
+        navigationRoute = ROUTES.DETAILS.getRoute(displayNameOrLogin);
+    } else {
+        // If neither an account ID or email is provided, don't render anything
+        return null;
+    }
 
-    const isOurMention = loginWithoutLeadingAt === props.currentUserPersonalDetails.login;
+    const isOurMention = accountID === props.currentUserPersonalDetails.accountID;
 
     return (
         <Text>
             <UserDetailsTooltip
                 accountID={accountID}
                 fallbackUserDetails={{
-                    displayName: loginWithoutLeadingAt,
+                    displayName: displayNameOrLogin,
                 }}
             >
                 <TextLink
                     // eslint-disable-next-line react/jsx-props-no-spreading
                     {...defaultRendererProps}
-                    href={ROUTES.getDetailsRoute(loginWithoutLeadingAt)}
+                    href={`/${navigationRoute}`}
                     style={[_.omit(props.style, 'color'), StyleUtils.getMentionStyle(isOurMention), {color: StyleUtils.getMentionTextColor(isOurMention)}]}
-                    onPress={() => showUserDetails(loginWithoutLeadingAt)}
+                    onPress={() => Navigation.navigate(navigationRoute)}
                     // Add testID so it is NOT selected as an anchor tag by SelectionScraper
                     testID="span"
                 >
-                    <TNodeChildrenRenderer tnode={props.tnode} />
+                    {!_.isEmpty(htmlAttribAccountID) ? `@${displayNameOrLogin}` : <TNodeChildrenRenderer tnode={props.tnode} />}
                 </TextLink>
             </UserDetailsTooltip>
         </Text>
@@ -65,4 +82,11 @@ function MentionUserRenderer(props) {
 MentionUserRenderer.propTypes = propTypes;
 MentionUserRenderer.displayName = 'MentionUserRenderer';
 
-export default withCurrentUserPersonalDetails(MentionUserRenderer);
+export default compose(
+    withCurrentUserPersonalDetails,
+    withOnyx({
+        personalDetails: {
+            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+        },
+    }),
+)(MentionUserRenderer);
diff --git a/src/components/HTMLEngineProvider/applyStrikethrough/index.js b/src/components/HTMLEngineProvider/applyStrikethrough/index.js
deleted file mode 100644
index b754a37dbde9..000000000000
--- a/src/components/HTMLEngineProvider/applyStrikethrough/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-function applyStrikethrough(html) {
-    return html;
-}
-
-export default applyStrikethrough;
diff --git a/src/components/HTMLEngineProvider/applyStrikethrough/index.native.js b/src/components/HTMLEngineProvider/applyStrikethrough/index.native.js
deleted file mode 100644
index 266e4eb20f62..000000000000
--- a/src/components/HTMLEngineProvider/applyStrikethrough/index.native.js
+++ /dev/null
@@ -1,8 +0,0 @@
-function applyStrikethrough(html, isPendingDelete) {
-    if (isPendingDelete) {
-        return `<del>${html}</del>`;
-    }
-    return html;
-}
-
-export default applyStrikethrough;
diff --git a/src/components/StaticHeaderPageLayout.js b/src/components/HeaderPageLayout.js
similarity index 52%
rename from src/components/StaticHeaderPageLayout.js
rename to src/components/HeaderPageLayout.js
index f97e42329942..c53ec37a0b34 100644
--- a/src/components/StaticHeaderPageLayout.js
+++ b/src/components/HeaderPageLayout.js
@@ -10,6 +10,8 @@ import themeColors from '../styles/themes/default';
 import * as StyleUtils from '../styles/StyleUtils';
 import useWindowDimensions from '../hooks/useWindowDimensions';
 import FixedFooter from './FixedFooter';
+import useNetwork from '../hooks/useNetwork';
+import * as Browser from '../libs/Browser';
 
 const propTypes = {
     ...headerWithBackButtonPropTypes,
@@ -22,16 +24,26 @@ const propTypes = {
 
     /** A fixed footer to display at the bottom of the page. */
     footer: PropTypes.node,
+
+    /** The image to display in the upper half of the screen. */
+    header: PropTypes.node,
+
+    /** Style to apply to the header image container */
+    // eslint-disable-next-line react/forbid-prop-types
+    headerContainerStyles: PropTypes.arrayOf(PropTypes.object),
 };
 
 const defaultProps = {
     backgroundColor: themeColors.appBG,
+    header: null,
+    headerContainerStyles: [],
     footer: null,
 };
 
-function StaticHeaderPageLayout({backgroundColor, children, image: Image, footer, imageContainerStyle, style, ...propsToPassToHeader}) {
-    const {windowHeight} = useWindowDimensions();
-
+function HeaderPageLayout({backgroundColor, children, footer, headerContainerStyles, style, headerContent, ...propsToPassToHeader}) {
+    const {windowHeight, isSmallScreenWidth} = useWindowDimensions();
+    const {isOffline} = useNetwork();
+    const appBGColor = StyleUtils.getBackgroundColorStyle(themeColors.appBG);
     const {titleColor, iconFill} = useMemo(() => {
         const isColorfulBackground = backgroundColor !== themeColors.appBG;
         return {
@@ -45,7 +57,8 @@ function StaticHeaderPageLayout({backgroundColor, children, image: Image, footer
             style={[StyleUtils.getBackgroundColorStyle(backgroundColor)]}
             shouldEnablePickerAvoiding={false}
             includeSafeAreaPaddingBottom={false}
-            offlineIndicatorStyle={[StyleUtils.getBackgroundColorStyle(themeColors.appBG)]}
+            offlineIndicatorStyle={[appBGColor]}
+            testID={HeaderPageLayout.displayName}
         >
             {({safeAreaPaddingBottomStyle}) => (
                 <>
@@ -55,27 +68,24 @@ function StaticHeaderPageLayout({backgroundColor, children, image: Image, footer
                         titleColor={titleColor}
                         iconFill={iconFill}
                     />
-                    <View style={[styles.flex1, StyleUtils.getBackgroundColorStyle(themeColors.appBG)]}>
+                    <View style={[styles.flex1, appBGColor, !isOffline && !_.isNull(footer) ? safeAreaPaddingBottomStyle : {}]}>
+                        {/** Safari on ios/mac has a bug where overscrolling the page scrollview shows green background color. This is a workaround to fix that. https://github.com/Expensify/App/issues/23422 */}
+                        {Browser.isSafari() && (
+                            <View style={styles.dualColorOverscrollSpacer}>
+                                <View style={[styles.flex1, StyleUtils.getBackgroundColorStyle(backgroundColor)]} />
+                                <View style={[isSmallScreenWidth ? styles.flex1 : styles.flex3, appBGColor]} />
+                            </View>
+                        )}
                         <ScrollView
                             contentContainerStyle={[safeAreaPaddingBottomStyle, style]}
                             showsVerticalScrollIndicator={false}
+                            offlineIndicatorStyle={[appBGColor]}
                         >
-                            <View style={styles.overscrollSpacer(backgroundColor, windowHeight)} />
-                            <View
-                                style={[
-                                    styles.alignItemsCenter,
-                                    styles.justifyContentEnd,
-                                    StyleUtils.getBackgroundColorStyle(backgroundColor),
-                                    imageContainerStyle,
-                                    styles.staticHeaderImage,
-                                ]}
-                            >
-                                <Image
-                                    pointerEvents="none"
-                                    style={styles.staticHeaderImage}
-                                />
+                            {!Browser.isSafari() && <View style={styles.overscrollSpacer(backgroundColor, windowHeight)} />}
+                            <View style={[styles.alignItemsCenter, styles.justifyContentEnd, StyleUtils.getBackgroundColorStyle(backgroundColor), ...headerContainerStyles]}>
+                                {headerContent}
                             </View>
-                            <View style={styles.pt5}>{children}</View>
+                            <View style={[styles.pt5, appBGColor]}>{children}</View>
                         </ScrollView>
                         {!_.isNull(footer) && <FixedFooter>{footer}</FixedFooter>}
                     </View>
@@ -85,8 +95,8 @@ function StaticHeaderPageLayout({backgroundColor, children, image: Image, footer
     );
 }
 
-StaticHeaderPageLayout.propTypes = propTypes;
-StaticHeaderPageLayout.defaultProps = defaultProps;
-StaticHeaderPageLayout.displayName = 'StaticHeaderPageLayout';
+HeaderPageLayout.propTypes = propTypes;
+HeaderPageLayout.defaultProps = defaultProps;
+HeaderPageLayout.displayName = 'HeaderPageLayout';
 
-export default StaticHeaderPageLayout;
+export default HeaderPageLayout;
diff --git a/src/components/HeaderWithBackButton/index.js b/src/components/HeaderWithBackButton/index.js
index bbf905cc1ac2..c720529371d7 100755
--- a/src/components/HeaderWithBackButton/index.js
+++ b/src/components/HeaderWithBackButton/index.js
@@ -22,7 +22,7 @@ import useKeyboardState from '../../hooks/useKeyboardState';
 function HeaderWithBackButton({
     iconFill = undefined,
     guidesCallTaskID = '',
-    onBackButtonPress = () => Navigation.goBack(),
+    onBackButtonPress = () => Navigation.goBack(ROUTES.HOME),
     onCloseButtonPress = () => Navigation.dismissModal(),
     onDownloadButtonPress = () => {},
     onThreeDotsButtonPress = () => {},
@@ -47,6 +47,8 @@ function HeaderWithBackButton({
     },
     threeDotsMenuItems = [],
     children = null,
+    onModalHide = () => {},
+    shouldOverlay = false,
 }) {
     const [isDownloadButtonActive, temporarilyDisableDownloadButton] = useThrottledButtonState();
     const {translate} = useLocalize();
@@ -119,7 +121,7 @@ function HeaderWithBackButton({
                     {shouldShowGetAssistanceButton && (
                         <Tooltip text={translate('getAssistancePage.questionMarkButtonTooltip')}>
                             <PressableWithoutFeedback
-                                onPress={() => Navigation.navigate(ROUTES.getGetAssistanceRoute(guidesCallTaskID))}
+                                onPress={() => Navigation.navigate(ROUTES.GET_ASSISTANCE.getRoute(guidesCallTaskID))}
                                 style={[styles.touchableButtonImage]}
                                 accessibilityRole="button"
                                 accessibilityLabel={translate('getAssistancePage.questionMarkButtonTooltip')}
@@ -137,6 +139,8 @@ function HeaderWithBackButton({
                             menuItems={threeDotsMenuItems}
                             onIconPress={onThreeDotsButtonPress}
                             anchorPosition={threeDotsAnchorPosition}
+                            onModalHide={onModalHide}
+                            shouldOverlay={shouldOverlay}
                         />
                     )}
                     {shouldShowCloseButton && (
diff --git a/src/components/Hoverable/hoverablePropTypes.js b/src/components/Hoverable/hoverablePropTypes.js
index 9fb2e3bc7306..d483a06d6aaf 100644
--- a/src/components/Hoverable/hoverablePropTypes.js
+++ b/src/components/Hoverable/hoverablePropTypes.js
@@ -12,12 +12,16 @@ const propTypes = {
 
     /** Function that executes when the mouse leaves the children. */
     onHoverOut: PropTypes.func,
+
+    /** Decides whether to handle the scroll behaviour to show hover once the scroll ends */
+    shouldHandleScroll: PropTypes.bool,
 };
 
 const defaultProps = {
     disabled: false,
     onHoverIn: () => {},
     onHoverOut: () => {},
+    shouldHandleScroll: false,
 };
 
 export {propTypes, defaultProps};
diff --git a/src/components/Hoverable/index.js b/src/components/Hoverable/index.js
index 35bbd4af7fd6..38ea64952a2c 100644
--- a/src/components/Hoverable/index.js
+++ b/src/components/Hoverable/index.js
@@ -1,7 +1,9 @@
 import _ from 'underscore';
 import React, {Component} from 'react';
+import {DeviceEventEmitter} from 'react-native';
 import {propTypes, defaultProps} from './hoverablePropTypes';
 import * as DeviceCapabilities from '../../libs/DeviceCapabilities';
+import CONST from '../../CONST';
 
 /**
  * It is necessary to create a Hoverable component instead of relying solely on Pressable support for hover state,
@@ -13,16 +15,42 @@ class Hoverable extends Component {
         super(props);
 
         this.handleVisibilityChange = this.handleVisibilityChange.bind(this);
+        this.checkHover = this.checkHover.bind(this);
 
         this.state = {
             isHovered: false,
         };
 
+        this.isHoveredRef = false;
+        this.isScrollingRef = false;
         this.wrapperView = null;
     }
 
     componentDidMount() {
         document.addEventListener('visibilitychange', this.handleVisibilityChange);
+        document.addEventListener('mouseover', this.checkHover);
+
+        /**
+         * Only add the scrolling listener if the shouldHandleScroll prop is true
+         * and the scrollingListener is not already set.
+         */
+        if (!this.scrollingListener && this.props.shouldHandleScroll) {
+            this.scrollingListener = DeviceEventEmitter.addListener(CONST.EVENTS.SCROLLING, (scrolling) => {
+                /**
+                 * If user has stopped scrolling and the isHoveredRef is true, then we should update the hover state.
+                 */
+                if (!scrolling && this.isHoveredRef) {
+                    this.setState({isHovered: this.isHoveredRef}, this.props.onHoverIn);
+                } else if (scrolling && this.isHoveredRef) {
+                    /**
+                     * If the user has started scrolling and the isHoveredRef is true, then we should set the hover state to false.
+                     * This is to hide the existing hover and reaction bar.
+                     */
+                    this.setState({isHovered: false}, this.props.onHoverOut);
+                }
+                this.isScrollingRef = scrolling;
+            });
+        }
     }
 
     componentDidUpdate(prevProps) {
@@ -37,6 +65,10 @@ class Hoverable extends Component {
 
     componentWillUnmount() {
         document.removeEventListener('visibilitychange', this.handleVisibilityChange);
+        document.removeEventListener('mouseover', this.checkHover);
+        if (this.scrollingListener) {
+            this.scrollingListener.remove();
+        }
     }
 
     /**
@@ -49,11 +81,42 @@ class Hoverable extends Component {
             return;
         }
 
+        /**
+         * Capture whther or not the user is hovering over the component.
+         * We will use this to determine if we should update the hover state when the user has stopped scrolling.
+         */
+        this.isHoveredRef = isHovered;
+
+        /**
+         * If the isScrollingRef is true, then the user is scrolling and we should not update the hover state.
+         */
+        if (this.isScrollingRef && this.props.shouldHandleScroll && !this.state.isHovered) {
+            return;
+        }
+
         if (isHovered !== this.state.isHovered) {
             this.setState({isHovered}, isHovered ? this.props.onHoverIn : this.props.onHoverOut);
         }
     }
 
+    /**
+     * Checks the hover state of a component and updates it based on the event target.
+     * This is necessary to handle cases where the hover state might get stuck due to an unreliable mouseleave trigger,
+     * such as when an element is removed before the mouseleave event is triggered.
+     * @param {Event} e - The hover event object.
+     */
+    checkHover(e) {
+        if (!this.wrapperView || !this.state.isHovered) {
+            return;
+        }
+
+        if (this.wrapperView.contains(e.target)) {
+            return;
+        }
+
+        this.setIsHovered(false);
+    }
+
     handleVisibilityChange() {
         if (document.visibilityState !== 'hidden') {
             return;
diff --git a/src/components/Icon/Expensicons.js b/src/components/Icon/Expensicons.js
index 42db57068edc..810bbc86b5dc 100644
--- a/src/components/Icon/Expensicons.js
+++ b/src/components/Icon/Expensicons.js
@@ -19,6 +19,7 @@ import Camera from '../../../assets/images/camera.svg';
 import Car from '../../../assets/images/car.svg';
 import Cash from '../../../assets/images/cash.svg';
 import ChatBubble from '../../../assets/images/chatbubble.svg';
+import ChatBubbles from '../../../assets/images/chatbubbles.svg';
 import Checkmark from '../../../assets/images/checkmark.svg';
 import Chair from '../../../assets/images/chair.svg';
 import Close from '../../../assets/images/close.svg';
@@ -82,7 +83,6 @@ import NewWorkspace from '../../../assets/images/new-workspace.svg';
 import Offline from '../../../assets/images/offline.svg';
 import OfflineCloud from '../../../assets/images/offline-cloud.svg';
 import Paperclip from '../../../assets/images/paperclip.svg';
-import PayPal from '../../../assets/images/paypal.svg';
 import Paycheck from '../../../assets/images/paycheck.svg';
 import Pencil from '../../../assets/images/pencil.svg';
 import Phone from '../../../assets/images/phone.svg';
@@ -148,6 +148,7 @@ export {
     Car,
     Cash,
     ChatBubble,
+    ChatBubbles,
     Checkmark,
     Chair,
     Close,
@@ -216,7 +217,6 @@ export {
     Offline,
     OfflineCloud,
     Paperclip,
-    PayPal,
     Paycheck,
     Pencil,
     Phone,
diff --git a/src/components/IllustratedHeaderPageLayout.js b/src/components/IllustratedHeaderPageLayout.js
index d1403bd4029e..ac916117094b 100644
--- a/src/components/IllustratedHeaderPageLayout.js
+++ b/src/components/IllustratedHeaderPageLayout.js
@@ -1,17 +1,10 @@
-import _ from 'underscore';
 import React from 'react';
 import PropTypes from 'prop-types';
-import {ScrollView, View} from 'react-native';
 import Lottie from 'lottie-react-native';
 import headerWithBackButtonPropTypes from './HeaderWithBackButton/headerWithBackButtonPropTypes';
-import HeaderWithBackButton from './HeaderWithBackButton';
-import ScreenWrapper from './ScreenWrapper';
 import styles from '../styles/styles';
 import themeColors from '../styles/themes/default';
-import * as StyleUtils from '../styles/StyleUtils';
-import useWindowDimensions from '../hooks/useWindowDimensions';
-import FixedFooter from './FixedFooter';
-import useNetwork from '../hooks/useNetwork';
+import HeaderPageLayout from './HeaderPageLayout';
 
 const propTypes = {
     ...headerWithBackButtonPropTypes,
@@ -27,52 +20,40 @@ const propTypes = {
 
     /** A fixed footer to display at the bottom of the page. */
     footer: PropTypes.node,
+
+    /** Overlay content to display on top of animation */
+    overlayContent: PropTypes.func,
 };
 
 const defaultProps = {
     backgroundColor: themeColors.appBG,
     footer: null,
+    overlayContent: null,
 };
 
-function IllustratedHeaderPageLayout({backgroundColor, children, illustration, footer, ...propsToPassToHeader}) {
-    const {windowHeight} = useWindowDimensions();
-    const {isOffline} = useNetwork();
+function IllustratedHeaderPageLayout({backgroundColor, children, illustration, footer, overlayContent, ...propsToPassToHeader}) {
     return (
-        <ScreenWrapper
-            style={[StyleUtils.getBackgroundColorStyle(backgroundColor)]}
-            shouldEnablePickerAvoiding={false}
-            includeSafeAreaPaddingBottom={false}
-            offlineIndicatorStyle={[StyleUtils.getBackgroundColorStyle(themeColors.appBG)]}
-        >
-            {({safeAreaPaddingBottomStyle}) => (
+        <HeaderPageLayout
+            backgroundColor={backgroundColor}
+            title={propsToPassToHeader.title}
+            headerContent={
                 <>
-                    <HeaderWithBackButton
-                        // eslint-disable-next-line react/jsx-props-no-spreading
-                        {...propsToPassToHeader}
-                        titleColor={backgroundColor === themeColors.appBG ? undefined : themeColors.textColorfulBackground}
-                        iconFill={backgroundColor === themeColors.appBG ? undefined : themeColors.iconColorfulBackground}
+                    <Lottie
+                        source={illustration}
+                        style={styles.w100}
+                        autoPlay
+                        loop
                     />
-                    <View style={[styles.flex1, StyleUtils.getBackgroundColorStyle(themeColors.appBG), !isOffline ? safeAreaPaddingBottomStyle : {}]}>
-                        <ScrollView
-                            contentContainerStyle={safeAreaPaddingBottomStyle}
-                            showsVerticalScrollIndicator={false}
-                        >
-                            <View style={styles.overscrollSpacer(backgroundColor, windowHeight)} />
-                            <View style={[styles.alignItemsCenter, styles.justifyContentEnd, StyleUtils.getBackgroundColorStyle(backgroundColor)]}>
-                                <Lottie
-                                    source={illustration}
-                                    style={styles.w100}
-                                    autoPlay
-                                    loop
-                                />
-                            </View>
-                            <View style={[styles.pt5]}>{children}</View>
-                        </ScrollView>
-                        {!_.isNull(footer) && <FixedFooter>{footer}</FixedFooter>}
-                    </View>
+                    {overlayContent && overlayContent()}
                 </>
-            )}
-        </ScreenWrapper>
+            }
+            headerContainerStyles={[styles.justifyContentCenter, styles.w100]}
+            footer={footer}
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...propsToPassToHeader}
+        >
+            {children}
+        </HeaderPageLayout>
     );
 }
 
diff --git a/src/components/Image/imagePropTypes.js b/src/components/Image/imagePropTypes.js
index 46ec83384d62..c02e48eef659 100644
--- a/src/components/Image/imagePropTypes.js
+++ b/src/components/Image/imagePropTypes.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import stylePropTypes from '../../styles/stylePropTypes';
+import sourcePropTypes from './sourcePropTypes';
 import RESIZE_MODES from './resizeModes';
 
 const imagePropTypes = {
@@ -7,14 +8,7 @@ const imagePropTypes = {
     style: stylePropTypes,
 
     /** The static asset or URI source of the image */
-    source: PropTypes.oneOfType([
-        PropTypes.number,
-        PropTypes.shape({
-            uri: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
-            // eslint-disable-next-line react/forbid-prop-types
-            headers: PropTypes.object,
-        }),
-    ]).isRequired,
+    source: sourcePropTypes.isRequired,
 
     /** Should an auth token be included in the image request */
     isAuthTokenRequired: PropTypes.bool,
diff --git a/src/components/Image/sourcePropTypes/index.js b/src/components/Image/sourcePropTypes/index.js
new file mode 100644
index 000000000000..99e88b5cf343
--- /dev/null
+++ b/src/components/Image/sourcePropTypes/index.js
@@ -0,0 +1,11 @@
+import PropTypes from 'prop-types';
+
+export default PropTypes.oneOfType([
+    PropTypes.number,
+    PropTypes.shape({
+        uri: PropTypes.string.isRequired,
+        // eslint-disable-next-line react/forbid-prop-types
+        headers: PropTypes.object,
+    }),
+    PropTypes.string,
+]);
diff --git a/src/components/Image/sourcePropTypes/index.native.js b/src/components/Image/sourcePropTypes/index.native.js
new file mode 100644
index 000000000000..629b21852613
--- /dev/null
+++ b/src/components/Image/sourcePropTypes/index.native.js
@@ -0,0 +1,10 @@
+import PropTypes from 'prop-types';
+
+export default PropTypes.oneOfType([
+    PropTypes.number,
+    PropTypes.shape({
+        uri: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+        // eslint-disable-next-line react/forbid-prop-types
+        headers: PropTypes.object,
+    }),
+]);
diff --git a/src/components/ImageView/index.js b/src/components/ImageView/index.js
index c92bd7738253..1d90a5723016 100644
--- a/src/components/ImageView/index.js
+++ b/src/components/ImageView/index.js
@@ -22,13 +22,16 @@ const propTypes = {
 
     /** image file name */
     fileName: PropTypes.string.isRequired,
+
+    onError: PropTypes.func,
 };
 
 const defaultProps = {
     isAuthTokenRequired: false,
+    onError: () => {},
 };
 
-function ImageView({isAuthTokenRequired, url, fileName}) {
+function ImageView({isAuthTokenRequired, url, fileName, onError}) {
     const [isLoading, setIsLoading] = useState(true);
     const [containerHeight, setContainerHeight] = useState(0);
     const [containerWidth, setContainerWidth] = useState(0);
@@ -87,7 +90,9 @@ function ImageView({isAuthTokenRequired, url, fileName}) {
     };
 
     const imageLoadingStart = () => {
-        if (!isLoading) return;
+        if (!isLoading) {
+            return;
+        }
         setIsLoading(true);
         setZoomScale(0);
         setIsZoomed(false);
@@ -141,11 +146,16 @@ function ImageView({isAuthTokenRequired, url, fileName}) {
      */
     const onContainerPress = (e) => {
         if (!isZoomed && !isDragging) {
-            const {offsetX, offsetY} = e.nativeEvent;
-            // Dividing clicked positions by the zoom scale to get coordinates
-            // so that once we zoom we will scroll to the clicked location.
-            const delta = getScrollOffset(offsetX / zoomScale, offsetY / zoomScale);
-            setZoomDelta(delta);
+            if (e.nativeEvent) {
+                const {offsetX, offsetY} = e.nativeEvent;
+
+                // Dividing clicked positions by the zoom scale to get coordinates
+                // so that once we zoom we will scroll to the clicked location.
+                const delta = getScrollOffset(offsetX / zoomScale, offsetY / zoomScale);
+                setZoomDelta(delta);
+            } else {
+                setZoomDelta({offsetX: 0, offsetY: 0});
+            }
         }
 
         if (isZoomed && isDragging && isMouseDown) {
@@ -225,14 +235,15 @@ function ImageView({isAuthTokenRequired, url, fileName}) {
                     source={{uri: url}}
                     isAuthTokenRequired={isAuthTokenRequired}
                     // Hide image until finished loading to prevent showing preview with wrong dimensions.
-                    style={isLoading ? undefined : [styles.w100, styles.h100]}
+                    style={isLoading || zoomScale === 0 ? undefined : [styles.w100, styles.h100]}
                     // When Image dimensions are lower than the container boundary(zoomscale <= 1), use `contain` to render the image with natural dimensions.
                     // Both `center` and `contain` keeps the image centered on both x and y axis.
                     resizeMode={zoomScale > 1 ? Image.resizeMode.center : Image.resizeMode.contain}
                     onLoadStart={imageLoadingStart}
                     onLoad={imageLoad}
+                    onError={onError}
                 />
-                {isLoading && <FullscreenLoadingIndicator style={[styles.opacity1, styles.bgTransparent]} />}
+                {(isLoading || zoomScale === 0) && <FullscreenLoadingIndicator style={[styles.opacity1, styles.bgTransparent]} />}
             </View>
         );
     }
@@ -261,6 +272,7 @@ function ImageView({isAuthTokenRequired, url, fileName}) {
                     resizeMode={Image.resizeMode.contain}
                     onLoadStart={imageLoadingStart}
                     onLoad={imageLoad}
+                    onError={onError}
                 />
             </PressableWithoutFeedback>
 
diff --git a/src/components/InvertedFlatList/BaseInvertedFlatList.js b/src/components/InvertedFlatList/BaseInvertedFlatList.js
index d3fcda0ea5fd..0bfffb733052 100644
--- a/src/components/InvertedFlatList/BaseInvertedFlatList.js
+++ b/src/components/InvertedFlatList/BaseInvertedFlatList.js
@@ -136,8 +136,6 @@ class BaseInvertedFlatList extends Component {
                 // Native platforms do not need to measure items and work fine without this.
                 // Web requires that items be measured or else crazy things happen when scrolling.
                 getItemLayout={this.props.shouldMeasureItems ? this.getItemLayout : undefined}
-                // We keep this property very low so that chat switching remains fast
-                maxToRenderPerBatch={1}
                 windowSize={15}
 
                 // Commenting the line below as it breaks the unread indicator test
diff --git a/src/components/InvertedFlatList/index.js b/src/components/InvertedFlatList/index.js
index 923a17210af7..d46cd5801605 100644
--- a/src/components/InvertedFlatList/index.js
+++ b/src/components/InvertedFlatList/index.js
@@ -1,9 +1,10 @@
-import React, {forwardRef} from 'react';
+import React, {forwardRef, useEffect, useRef} from 'react';
 import PropTypes from 'prop-types';
-import {FlatList, StyleSheet} from 'react-native';
+import {DeviceEventEmitter, FlatList, StyleSheet} from 'react-native';
 import _ from 'underscore';
 import BaseInvertedFlatList from './BaseInvertedFlatList';
 import styles from '../../styles/styles';
+import CONST from '../../CONST';
 
 const propTypes = {
     /** Passed via forwardRef so we can access the FlatList ref */
@@ -14,43 +15,121 @@ const propTypes = {
     /** Any additional styles to apply */
     // eslint-disable-next-line react/forbid-prop-types
     contentContainerStyle: PropTypes.any,
+
+    /** Same as for FlatList */
+    onScroll: PropTypes.func,
 };
 
 // This is adapted from https://codesandbox.io/s/react-native-dsyse
 // It's a HACK alert since FlatList has inverted scrolling on web
-class InvertedFlatList extends React.Component {
-    constructor(props) {
-        super(props);
+function InvertedFlatList(props) {
+    const {innerRef, contentContainerStyle} = props;
+    const listRef = React.createRef();
 
-        this.list = undefined;
-    }
+    const lastScrollEvent = useRef(null);
+    const scrollEndTimeout = useRef(null);
+    const updateInProgress = useRef(false);
+    const eventHandler = useRef(null);
 
-    componentDidMount() {
-        if (!_.isFunction(this.props.innerRef)) {
+    useEffect(() => {
+        if (!_.isFunction(innerRef)) {
             // eslint-disable-next-line no-param-reassign
-            this.props.innerRef.current = this.list;
+            innerRef.current = listRef.current;
         } else {
-            this.props.innerRef(this.list);
+            innerRef(listRef);
+        }
+
+        return () => {
+            if (scrollEndTimeout.current) {
+                clearTimeout(scrollEndTimeout.current);
+            }
+
+            if (eventHandler.current) {
+                eventHandler.current.remove();
+            }
+        };
+    }, [innerRef, listRef]);
+
+    /**
+     * Emits when the scrolling is in progress. Also,
+     * invokes the onScroll callback function from props.
+     *
+     * @param {Event} event - The onScroll event from the FlatList
+     */
+    const onScroll = (event) => {
+        props.onScroll(event);
+
+        if (!updateInProgress.current) {
+            updateInProgress.current = true;
+            eventHandler.current = DeviceEventEmitter.emit(CONST.EVENTS.SCROLLING, true);
+        }
+    };
+
+    /**
+     * Emits when the scrolling has ended.
+     */
+    const onScrollEnd = () => {
+        eventHandler.current = DeviceEventEmitter.emit(CONST.EVENTS.SCROLLING, false);
+        updateInProgress.current = false;
+    };
+
+    /**
+     * Decides whether the scrolling has ended or not. If it has ended,
+     * then it calls the onScrollEnd function. Otherwise, it calls the
+     * onScroll function and pass the event to it.
+     *
+     * This is a temporary work around, since react-native-web doesn't
+     * support onScrollBeginDrag and onScrollEndDrag props for FlatList.
+     * More info:
+     * https://github.com/necolas/react-native-web/pull/1305
+     *
+     * This workaround is taken from below and refactored to fit our needs:
+     * https://github.com/necolas/react-native-web/issues/1021#issuecomment-984151185
+     *
+     * @param {Event} event - The onScroll event from the FlatList
+     */
+    const handleScroll = (event) => {
+        onScroll(event);
+        const timestamp = Date.now();
+
+        if (scrollEndTimeout.current) {
+            clearTimeout(scrollEndTimeout.current);
         }
-    }
-
-    render() {
-        return (
-            <BaseInvertedFlatList
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...this.props}
-                inverted
-                ref={(el) => (this.list = el)}
-                shouldMeasureItems
-                contentContainerStyle={StyleSheet.compose(this.props.contentContainerStyle, styles.justifyContentEnd)}
-            />
-        );
-    }
+
+        if (lastScrollEvent.current) {
+            scrollEndTimeout.current = setTimeout(() => {
+                if (lastScrollEvent.current !== timestamp) {
+                    return;
+                }
+                // Scroll has ended
+                lastScrollEvent.current = null;
+                onScrollEnd();
+            }, 250);
+        }
+
+        lastScrollEvent.current = timestamp;
+    };
+
+    return (
+        <BaseInvertedFlatList
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            inverted
+            ref={listRef}
+            shouldMeasureItems
+            contentContainerStyle={StyleSheet.compose(contentContainerStyle, styles.justifyContentEnd)}
+            onScroll={handleScroll}
+            // We need to keep batch size to one to workaround a bug in react-native-web.
+            // This can be removed once https://github.com/Expensify/App/pull/24482 is merged.
+            maxToRenderPerBatch={1}
+        />
+    );
 }
 
 InvertedFlatList.propTypes = propTypes;
 InvertedFlatList.defaultProps = {
     contentContainerStyle: {},
+    onScroll: () => {},
 };
 
 export default forwardRef((props, ref) => (
diff --git a/src/components/KYCWall/BaseKYCWall.js b/src/components/KYCWall/BaseKYCWall.js
index 4684901e47b1..ebf115c5de59 100644
--- a/src/components/KYCWall/BaseKYCWall.js
+++ b/src/components/KYCWall/BaseKYCWall.js
@@ -142,7 +142,6 @@ class KYCWall extends React.Component {
                         vertical: this.state.anchorPositionVertical,
                         horizontal: this.state.anchorPositionHorizontal,
                     }}
-                    shouldShowPaypal={false}
                     onItemSelected={(item) => {
                         this.setState({shouldShowAddPaymentMenu: false});
                         if (item === CONST.PAYMENT_METHODS.BANK_ACCOUNT) {
diff --git a/src/components/KeyboardShortcutsModal.js b/src/components/KeyboardShortcutsModal.js
index 9d78a22b5aa8..6ca3cce6412c 100644
--- a/src/components/KeyboardShortcutsModal.js
+++ b/src/components/KeyboardShortcutsModal.js
@@ -1,4 +1,4 @@
-import React, {useEffect, useRef} from 'react';
+import React, {useEffect, useRef, useState} from 'react';
 import PropTypes from 'prop-types';
 import {View, ScrollView} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
@@ -41,7 +41,7 @@ const openShortcutModalConfig = CONST.KEYBOARD_SHORTCUTS.SHORTCUT_MODAL;
 function KeyboardShortcutsModal({isShortcutsModalOpen = false, isSmallScreenWidth, translate}) {
     const subscribedOpenModalShortcuts = useRef([]);
     const modalType = isSmallScreenWidth ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE;
-    const shortcuts = KeyboardShortcut.getDocumentedShortcuts();
+    const [shortcuts, setShortcurts] = useState([]);
 
     /*
      * Subscribe shortcuts that only are used when the modal is open
@@ -79,6 +79,7 @@ function KeyboardShortcutsModal({isShortcutsModalOpen = false, isSmallScreenWidt
             KeyboardShortcut.subscribe(arrowUpConfig.shortcutKey, () => {}, arrowUpConfig.descriptionKey, arrowUpConfig.modifiers, true),
             KeyboardShortcut.subscribe(arrowDownConfig.shortcutKey, () => {}, arrowDownConfig.descriptionKey, arrowDownConfig.modifiers, true),
         ];
+        setShortcurts(KeyboardShortcut.getDocumentedShortcuts());
     };
 
     /*
diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index 95b1fc0f801e..3cfd7c4c4138 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';
@@ -86,8 +85,8 @@ function OptionRowLHN(props) {
     const displayNameStyle = StyleUtils.combineStyles([styles.optionDisplayName, styles.optionDisplayNameCompact, styles.pre, ...textUnreadStyle], props.style);
     const alternateTextStyle = StyleUtils.combineStyles(
         props.viewMode === CONST.OPTION_MODE.COMPACT
-            ? [textStyle, styles.optionAlternateText, styles.noWrap, styles.textLabelSupporting, styles.optionAlternateTextCompact, styles.ml2]
-            : [textStyle, styles.optionAlternateText, styles.noWrap, styles.textLabelSupporting],
+            ? [textStyle, styles.optionAlternateText, styles.pre, styles.textLabelSupporting, styles.optionAlternateTextCompact, styles.ml2]
+            : [textStyle, styles.optionAlternateText, styles.pre, styles.textLabelSupporting],
         props.style,
     );
     const contentContainerStyles =
@@ -103,10 +102,7 @@ function OptionRowLHN(props) {
     const hasBrickError = optionItem.brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
     const defaultSubscriptSize = optionItem.isExpenseRequest ? CONST.AVATAR_SIZE.SMALL_NORMAL : CONST.AVATAR_SIZE.DEFAULT;
     const shouldShowGreenDotIndicator =
-        !hasBrickError &&
-        (optionItem.isUnreadWithMention ||
-            ReportUtils.isWaitingForIOUActionFromCurrentUser(optionItem) ||
-            (optionItem.isTaskReport && optionItem.isTaskAssignee && !optionItem.isCompletedTaskReport && !optionItem.isArchivedRoom));
+        !hasBrickError && (optionItem.isUnreadWithMention || optionItem.isWaitingForTaskCompleteFromAssignee || ReportUtils.isWaitingForIOUActionFromCurrentUser(optionItem));
 
     /**
      * Show the ReportActionContextMenu modal popover.
@@ -121,7 +117,8 @@ function OptionRowLHN(props) {
             '',
             popoverAnchor,
             props.reportID,
-            {},
+            '0',
+            props.reportID,
             '',
             () => {},
             () => setIsContextMenuActive(false),
@@ -180,6 +177,7 @@ function OptionRowLHN(props) {
                         ]}
                         accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
                         accessibilityLabel={translate('accessibilityHints.navigatesToChat')}
+                        needsOffscreenAlphaCompositing={props.optionItem.icons.length >= 2}
                     >
                         <View style={sidebarInnerRowStyle}>
                             <View style={[styles.flexRow, styles.alignItemsCenter]}>
@@ -245,7 +243,7 @@ function OptionRowLHN(props) {
                                     <View style={[styles.alignItemsCenter, styles.justifyContentCenter]}>
                                         <Icon
                                             src={Expensicons.DotIndicator}
-                                            fill={colors.red}
+                                            fill={themeColors.danger}
                                         />
                                     </View>
                                 )}
@@ -256,10 +254,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..87358f05b9c9 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();
@@ -102,15 +106,16 @@ function OptionRowLHNData({
 
     const optionItem = useMemo(() => {
         // Note: ideally we'd have this as a dependent selector in onyx!
-        const item = SidebarUtils.getOptionData(fullReport, reportActions, personalDetails, preferredLocale, policy);
+        const item = SidebarUtils.getOptionData(fullReport, reportActions, personalDetails, preferredLocale, policy, parentReportAction);
         if (deepEqual(item, optionItemRef.current)) {
             return optionItemRef.current;
         }
         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) {
@@ -151,6 +156,7 @@ const personalDetailsSelector = (personalDetails) =>
                 firstName: personalData.firstName,
                 status: personalData.status,
                 avatar: UserUtils.getAvatar(personalData.avatar, personalData.accountID),
+                fallbackIcon: personalData.fallbackIcon,
             };
             return finalPersonalDetails;
         },
@@ -189,20 +195,28 @@ export default React.memo(
             preferredLocale: {
                 key: ONYXKEYS.NVP_PREFERRED_LOCALE,
             },
-            policies: {
-                key: ONYXKEYS.COLLECTION.POLICY,
-            },
         }),
+        // eslint-disable-next-line rulesdir/no-multiple-onyx-in-file
         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},
         }),
+        // eslint-disable-next-line rulesdir/no-multiple-onyx-in-file
+        withOnyx({
+            transaction: {
+                key: ({fullReport, parentReportActions}) =>
+                    `${ONYXKEYS.COLLECTION.TRANSACTION}${lodashGet(parentReportActions, [fullReport.parentReportActionID, 'originalMessage', 'IOUTransactionID'], '')}`,
+            },
+        }),
     )(OptionRowLHNData),
 );
diff --git a/src/components/LocaleContextProvider.js b/src/components/LocaleContextProvider.js
new file mode 100644
index 000000000000..b8838f253e74
--- /dev/null
+++ b/src/components/LocaleContextProvider.js
@@ -0,0 +1,135 @@
+import React, {createContext, useMemo} from 'react';
+import PropTypes from 'prop-types';
+import {withOnyx} from 'react-native-onyx';
+import lodashGet from 'lodash/get';
+
+import ONYXKEYS from '../ONYXKEYS';
+import * as Localize from '../libs/Localize';
+import DateUtils from '../libs/DateUtils';
+import * as NumberFormatUtils from '../libs/NumberFormatUtils';
+import * as LocaleDigitUtils from '../libs/LocaleDigitUtils';
+import CONST from '../CONST';
+import compose from '../libs/compose';
+import withCurrentUserPersonalDetails from './withCurrentUserPersonalDetails';
+import * as LocalePhoneNumber from '../libs/LocalePhoneNumber';
+
+const LocaleContext = createContext(null);
+
+const localeProviderPropTypes = {
+    /** The user's preferred locale e.g. 'en', 'es-ES' */
+    preferredLocale: PropTypes.string,
+
+    /** Actual content wrapped by this component */
+    children: PropTypes.node.isRequired,
+
+    /** The current user's personalDetails */
+    currentUserPersonalDetails: PropTypes.shape({
+        /** Timezone of the current user */
+        timezone: PropTypes.shape({
+            /** Value of the selected timezone */
+            selected: PropTypes.string,
+        }),
+    }),
+};
+
+const localeProviderDefaultProps = {
+    preferredLocale: CONST.LOCALES.DEFAULT,
+    currentUserPersonalDetails: {},
+};
+
+function LocaleContextProvider({children, currentUserPersonalDetails, preferredLocale}) {
+    const selectedTimezone = useMemo(() => lodashGet(currentUserPersonalDetails, 'timezone.selected'), [currentUserPersonalDetails]);
+
+    /**
+     * @param {String} phrase
+     * @param {Object} [variables]
+     * @returns {String}
+     */
+    const translate = useMemo(() => (phrase, variables) => Localize.translate(preferredLocale, phrase, variables), [preferredLocale]);
+
+    /**
+     * @param {Number} number
+     * @param {Intl.NumberFormatOptions} options
+     * @returns {String}
+     */
+    const numberFormat = useMemo(() => (number, options) => NumberFormatUtils.format(preferredLocale, number, options), [preferredLocale]);
+
+    /**
+     * @param {String} datetime
+     * @returns {String}
+     */
+    const datetimeToRelative = useMemo(() => (datetime) => DateUtils.datetimeToRelative(preferredLocale, datetime), [preferredLocale]);
+
+    /**
+     * @param {String} datetime - ISO-formatted datetime string
+     * @param {Boolean} [includeTimezone]
+     * @param {Boolean} isLowercase
+     * @returns {String}
+     */
+    const datetimeToCalendarTime = useMemo(
+        () =>
+            (datetime, includeTimezone, isLowercase = false) =>
+                DateUtils.datetimeToCalendarTime(preferredLocale, datetime, includeTimezone, selectedTimezone, isLowercase),
+        [preferredLocale, selectedTimezone],
+    );
+
+    /**
+     * Updates date-fns internal locale to the user preferredLocale
+     */
+    const updateLocale = useMemo(() => () => DateUtils.setLocale(preferredLocale), [preferredLocale]);
+
+    /**
+     * @param {String} phoneNumber
+     * @returns {String}
+     */
+    const formatPhoneNumber = LocalePhoneNumber.formatPhoneNumber;
+
+    /**
+     * @param {String} digit
+     * @returns {String}
+     */
+    const toLocaleDigit = useMemo(() => (digit) => LocaleDigitUtils.toLocaleDigit(preferredLocale, digit), [preferredLocale]);
+
+    /**
+     * @param {String} localeDigit
+     * @returns {String}
+     */
+    const fromLocaleDigit = useMemo(() => (localeDigit) => LocaleDigitUtils.fromLocaleDigit(preferredLocale, localeDigit), [preferredLocale]);
+
+    /**
+     * The context this component exposes to child components
+     * @returns {object} translation util functions and locale
+     */
+    const contextValue = useMemo(
+        () => ({
+            translate,
+            numberFormat,
+            datetimeToRelative,
+            datetimeToCalendarTime,
+            updateLocale,
+            formatPhoneNumber,
+            toLocaleDigit,
+            fromLocaleDigit,
+            preferredLocale,
+        }),
+        [translate, numberFormat, datetimeToRelative, datetimeToCalendarTime, updateLocale, formatPhoneNumber, toLocaleDigit, fromLocaleDigit, preferredLocale],
+    );
+
+    return <LocaleContext.Provider value={contextValue}>{children}</LocaleContext.Provider>;
+}
+
+LocaleContextProvider.propTypes = localeProviderPropTypes;
+LocaleContextProvider.defaultProps = localeProviderDefaultProps;
+
+const Provider = compose(
+    withCurrentUserPersonalDetails,
+    withOnyx({
+        preferredLocale: {
+            key: ONYXKEYS.NVP_PREFERRED_LOCALE,
+        },
+    }),
+)(LocaleContextProvider);
+
+Provider.displayName = 'withOnyx(LocaleContextProvider)';
+
+export {Provider as LocaleContextProvider, LocaleContext};
diff --git a/src/components/LocalePicker.js b/src/components/LocalePicker.js
index 532c29535e50..435f88e51e53 100644
--- a/src/components/LocalePicker.js
+++ b/src/components/LocalePicker.js
@@ -27,9 +27,11 @@ const defaultProps = {
 };
 
 function LocalePicker(props) {
-    const localesToLanguages = _.map(props.translate('languagePage.languages'), (language, key) => ({
-        value: key,
-        label: language.label,
+    const localesToLanguages = _.map(CONST.LANGUAGES, (language) => ({
+        value: language,
+        label: props.translate(`languagePage.languages.${language}.label`),
+        keyForList: language,
+        isSelected: props.preferredLocale === language,
     }));
     return (
         <Picker
diff --git a/src/components/LottieAnimations.js b/src/components/LottieAnimations.js
index ca05cebcb832..274d60306393 100644
--- a/src/components/LottieAnimations.js
+++ b/src/components/LottieAnimations.js
@@ -5,5 +5,6 @@ const PreferencesDJ = require('../../assets/animations/PreferencesDJ.json');
 const ReviewingBankInfo = require('../../assets/animations/ReviewingBankInfo.json');
 const WorkspacePlanet = require('../../assets/animations/WorkspacePlanet.json');
 const SaveTheWorld = require('../../assets/animations/SaveTheWorld.json');
+const Safe = require('../../assets/animations/Safe.json');
 
-export {ExpensifyLounge, Fireworks, Hands, PreferencesDJ, ReviewingBankInfo, SaveTheWorld, WorkspacePlanet};
+export {ExpensifyLounge, Fireworks, Hands, PreferencesDJ, ReviewingBankInfo, SaveTheWorld, WorkspacePlanet, Safe};
diff --git a/src/components/MagicCodeInput.js b/src/components/MagicCodeInput.js
index b21a275a6597..1db1acddc5d7 100644
--- a/src/components/MagicCodeInput.js
+++ b/src/components/MagicCodeInput.js
@@ -2,6 +2,7 @@ import React, {useEffect, useImperativeHandle, useRef, useState, forwardRef} fro
 import {StyleSheet, View} from 'react-native';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
+import {TapGestureHandler} from 'react-native-gesture-handler';
 import styles from '../styles/styles';
 import * as StyleUtils from '../styles/StyleUtils';
 import * as ValidationUtils from '../libs/ValidationUtils';
@@ -12,6 +13,9 @@ import FormHelpMessage from './FormHelpMessage';
 import {withNetwork} from './OnyxProvider';
 import networkPropTypes from './networkPropTypes';
 import useNetwork from '../hooks/useNetwork';
+import * as Browser from '../libs/Browser';
+
+const TEXT_INPUT_EMPTY_STATE = '';
 
 const propTypes = {
     /** Information about the network */
@@ -91,22 +95,40 @@ const composeToString = (value) => _.map(value, (v) => (v === undefined || v ===
 const getInputPlaceholderSlots = (length) => Array.from(Array(length).keys());
 
 function MagicCodeInput(props) {
-    const inputRefs = useRef([]);
-    const [input, setInput] = useState('');
+    const inputRefs = useRef();
+    const [input, setInput] = useState(TEXT_INPUT_EMPTY_STATE);
     const [focusedIndex, setFocusedIndex] = useState(0);
     const [editIndex, setEditIndex] = useState(0);
+    const shouldFocusLast = useRef(false);
+    const inputWidth = useRef(0);
+    const lastFocusedIndex = useRef(0);
 
     const blurMagicCodeInput = () => {
-        inputRefs.current[editIndex].blur();
+        inputRefs.current.blur();
         setFocusedIndex(undefined);
     };
 
+    const focusMagicCodeInput = () => {
+        setFocusedIndex(0);
+        lastFocusedIndex.current = 0;
+        setEditIndex(0);
+        inputRefs.current.focus();
+    };
+
     useImperativeHandle(props.innerRef, () => ({
         focus() {
-            inputRefs.current[0].focus();
+            focusMagicCodeInput();
+        },
+        resetFocus() {
+            setInput(TEXT_INPUT_EMPTY_STATE);
+            focusMagicCodeInput();
         },
         clear() {
-            inputRefs.current[0].focus();
+            setInput(TEXT_INPUT_EMPTY_STATE);
+            setFocusedIndex(0);
+            lastFocusedIndex.current = 0;
+            setEditIndex(0);
+            inputRefs.current.focus();
             props.onChangeText('');
         },
         blur() {
@@ -137,17 +159,37 @@ function MagicCodeInput(props) {
     }, [props.value, props.shouldSubmitOnComplete]);
 
     /**
-     * Callback for the onFocus event, updates the indexes
-     * of the currently focused input.
+     * Focuses on the input when it is pressed.
      *
      * @param {Object} event
      * @param {Number} index
      */
-    const onFocus = (event, index) => {
+    const onFocus = (event) => {
+        if (shouldFocusLast.current) {
+            setInput(TEXT_INPUT_EMPTY_STATE);
+            setFocusedIndex(lastFocusedIndex.current);
+            setEditIndex(lastFocusedIndex.current);
+        }
         event.preventDefault();
-        setInput('');
+    };
+
+    /**
+     * Callback for the onPress event, updates the indexes
+     * of the currently focused input.
+     *
+     * @param {Number} index
+     */
+    const onPress = (index) => {
+        shouldFocusLast.current = false;
+        // TapGestureHandler works differently on mobile web and native app
+        // On web gesture handler doesn't block interactions with textInput below so there is no need to run `focus()` manually
+        if (!Browser.isMobileChrome() && !Browser.isMobileSafari()) {
+            inputRefs.current.focus();
+        }
+        setInput(TEXT_INPUT_EMPTY_STATE);
         setFocusedIndex(index);
         setEditIndex(index);
+        lastFocusedIndex.current = index;
     };
 
     /**
@@ -175,7 +217,9 @@ function MagicCodeInput(props) {
         let numbers = decomposeString(props.value, props.maxLength);
         numbers = [...numbers.slice(0, editIndex), ...numbersArr, ...numbers.slice(numbersArr.length + editIndex, props.maxLength)];
 
-        inputRefs.current[updatedFocusedIndex].focus();
+        setFocusedIndex(updatedFocusedIndex);
+        setEditIndex(updatedFocusedIndex);
+        setInput(TEXT_INPUT_EMPTY_STATE);
 
         const finalInput = composeToString(numbers);
         props.onChangeText(finalInput);
@@ -196,7 +240,7 @@ function MagicCodeInput(props) {
             // If the currently focused index already has a value, it will delete
             // that value but maintain the focus on the same input.
             if (numbers[focusedIndex] !== CONST.MAGIC_CODE_EMPTY_CHAR) {
-                setInput('');
+                setInput(TEXT_INPUT_EMPTY_STATE);
                 numbers = [...numbers.slice(0, focusedIndex), CONST.MAGIC_CODE_EMPTY_CHAR, ...numbers.slice(focusedIndex + 1, props.maxLength)];
                 setEditIndex(focusedIndex);
                 props.onChangeText(composeToString(numbers));
@@ -215,24 +259,37 @@ function MagicCodeInput(props) {
             }
 
             const newFocusedIndex = Math.max(0, focusedIndex - 1);
+
+            // Saves the input string so that it can compare to the change text
+            // event that will be triggered, this is a workaround for mobile that
+            // triggers the change text on the event after the key press.
+            setInput(TEXT_INPUT_EMPTY_STATE);
+            setFocusedIndex(newFocusedIndex);
+            setEditIndex(newFocusedIndex);
             props.onChangeText(composeToString(numbers));
 
             if (!_.isUndefined(newFocusedIndex)) {
-                inputRefs.current[newFocusedIndex].focus();
+                inputRefs.current.focus();
             }
         }
         if (keyValue === 'ArrowLeft' && !_.isUndefined(focusedIndex)) {
             const newFocusedIndex = Math.max(0, focusedIndex - 1);
-            inputRefs.current[newFocusedIndex].focus();
+            setInput(TEXT_INPUT_EMPTY_STATE);
+            setFocusedIndex(newFocusedIndex);
+            setEditIndex(newFocusedIndex);
+            inputRefs.current.focus();
         } else if (keyValue === 'ArrowRight' && !_.isUndefined(focusedIndex)) {
             const newFocusedIndex = Math.min(focusedIndex + 1, props.maxLength - 1);
-            inputRefs.current[newFocusedIndex].focus();
+            setInput(TEXT_INPUT_EMPTY_STATE);
+            setFocusedIndex(newFocusedIndex);
+            setEditIndex(newFocusedIndex);
+            inputRefs.current.focus();
         } else if (keyValue === 'Enter') {
             // We should prevent users from submitting when it's offline.
             if (props.network.isOffline) {
                 return;
             }
-            setInput('');
+            setInput(TEXT_INPUT_EMPTY_STATE);
             props.onFulfill(props.value);
         }
     };
@@ -240,6 +297,48 @@ function MagicCodeInput(props) {
     return (
         <>
             <View style={[styles.magicCodeInputContainer]}>
+                <TapGestureHandler
+                    onBegan={(e) => {
+                        onPress(Math.floor(e.nativeEvent.x / (inputWidth.current / props.maxLength)));
+                    }}
+                >
+                    {/* Android does not handle touch on invisible Views so I created a wrapper around invisible TextInput just to handle taps */}
+                    <View
+                        style={[StyleSheet.absoluteFillObject, styles.w100, styles.h100, styles.invisibleOverlay]}
+                        collapsable={false}
+                    >
+                        <TextInput
+                            onLayout={(e) => {
+                                inputWidth.current = e.nativeEvent.layout.width;
+                            }}
+                            ref={(ref) => (inputRefs.current = ref)}
+                            autoFocus={props.autoFocus}
+                            inputMode="numeric"
+                            textContentType="oneTimeCode"
+                            name={props.name}
+                            maxLength={props.maxLength}
+                            value={input}
+                            hideFocusedState
+                            autoComplete={props.autoComplete}
+                            keyboardType={CONST.KEYBOARD_TYPE.NUMBER_PAD}
+                            onChangeText={(value) => {
+                                onChangeText(value);
+                            }}
+                            onKeyPress={onKeyPress}
+                            onFocus={onFocus}
+                            onBlur={() => {
+                                shouldFocusLast.current = true;
+                                lastFocusedIndex.current = focusedIndex;
+                                setFocusedIndex(undefined);
+                            }}
+                            selectionColor="transparent"
+                            inputStyle={[styles.inputTransparent]}
+                            accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
+                            style={[styles.inputTransparent]}
+                            textInputContainerStyles={[styles.borderNone]}
+                        />
+                    </View>
+                </TapGestureHandler>
                 {_.map(getInputPlaceholderSlots(props.maxLength), (index) => (
                     <View
                         key={index}
@@ -255,39 +354,6 @@ function MagicCodeInput(props) {
                         >
                             <Text style={[styles.magicCodeInput, styles.textAlignCenter]}>{decomposeString(props.value, props.maxLength)[index] || ''}</Text>
                         </View>
-                        {/* Hide the input above the text. Cannot set opacity to 0 as it would break pasting on iOS Safari. */}
-                        <View style={[StyleSheet.absoluteFillObject, styles.w100, styles.bgTransparent]}>
-                            <TextInput
-                                ref={(ref) => (inputRefs.current[index] = ref)}
-                                autoFocus={index === 0 && props.autoFocus}
-                                inputMode="numeric"
-                                textContentType="oneTimeCode"
-                                name={props.name}
-                                maxLength={props.maxLength}
-                                value={input}
-                                hideFocusedState
-                                autoComplete={index === 0 ? props.autoComplete : 'off'}
-                                keyboardType={CONST.KEYBOARD_TYPE.NUMBER_PAD}
-                                onChangeText={(value) => {
-                                    // Do not run when the event comes from an input that is
-                                    // not currently being responsible for the input, this is
-                                    // necessary to avoid calls when the input changes due to
-                                    // deleted characters. Only happens in mobile.
-                                    if (index !== editIndex || _.isUndefined(focusedIndex)) {
-                                        return;
-                                    }
-                                    onChangeText(value);
-                                }}
-                                onKeyPress={onKeyPress}
-                                onFocus={(event) => onFocus(event, index)}
-                                // Manually set selectionColor to make caret transparent.
-                                // We cannot use caretHidden as it breaks the pasting function on Android.
-                                selectionColor="transparent"
-                                textInputContainerStyles={[styles.borderNone]}
-                                inputStyle={[styles.inputTransparent]}
-                                accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                            />
-                        </View>
                     </View>
                 ))}
             </View>
diff --git a/src/components/MapView/MapView.tsx b/src/components/MapView/MapView.tsx
index aebd63edf559..9370cc95fb82 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);
 
@@ -53,8 +54,13 @@ const MapView = forwardRef<MapViewHandle, MapViewProps>(({accessToken, style, ma
     }, [accessToken]);
 
     const setMapIdle = (e: MapState) => {
-        if (e.gestures.isGestureActive) return;
+        if (e.gestures.isGestureActive) {
+            return;
+        }
         setIsIdle(true);
+        if (onMapReady) {
+            onMapReady();
+        }
     };
 
     return (
@@ -64,6 +70,9 @@ const MapView = forwardRef<MapViewHandle, MapViewProps>(({accessToken, style, ma
                 styleURL={styleURL}
                 onMapIdle={setMapIdle}
                 pitchEnabled={pitchEnabled}
+                attributionPosition={{...styles.r2, ...styles.b2}}
+                scaleBarEnabled={false}
+                logoPosition={{...styles.l2, ...styles.b2}}
                 // eslint-disable-next-line
                 {...responder.panHandlers}
             >
diff --git a/src/components/MapView/MapView.web.tsx b/src/components/MapView/MapView.web.tsx
index d1b26df8b00e..52f953e0d3bd 100644
--- a/src/components/MapView/MapView.web.tsx
+++ b/src/components/MapView/MapView.web.tsx
@@ -6,11 +6,14 @@
 import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useState} from 'react';
 import {View} from 'react-native';
 import Map, {MapRef, Marker} from 'react-map-gl';
+import mapboxgl from 'mapbox-gl';
 
 import responder from './responder';
 import utils from './utils';
 
 import CONST from '../../CONST';
+import * as StyleUtils from '../../styles/StyleUtils';
+import themeColors from '../../styles/themes/default';
 import Direction from './Direction';
 import {MapViewHandle, MapViewProps} from './MapViewTypes';
 
@@ -44,6 +47,21 @@ const MapView = forwardRef<MapViewHandle, MapViewProps>(
             map.fitBounds([northEast, southWest], {padding: mapPadding});
         }, [waypoints, mapRef, mapPadding]);
 
+        useEffect(() => {
+            if (!mapRef) {
+                return;
+            }
+
+            const resizeObserver = new ResizeObserver(() => {
+                mapRef.resize();
+            });
+            resizeObserver.observe(mapRef.getContainer());
+
+            return () => {
+                resizeObserver?.disconnect();
+            };
+        }, [mapRef]);
+
         useImperativeHandle(
             ref,
             () => ({
@@ -66,12 +84,14 @@ const MapView = forwardRef<MapViewHandle, MapViewProps>(
             >
                 <Map
                     ref={setRef}
+                    mapLib={mapboxgl}
                     mapboxAccessToken={accessToken}
                     initialViewState={{
                         longitude: initialState.location[0],
                         latitude: initialState.location[1],
                         zoom: initialState.zoom,
                     }}
+                    style={StyleUtils.getTextColorStyle(themeColors.mapAttributionText) as React.CSSProperties}
                     mapStyle={styleURL}
                 >
                     {waypoints?.map(({coordinate, markerComponent, id}) => {
diff --git a/src/components/MapView/MapViewTypes.ts b/src/components/MapView/MapViewTypes.ts
index cf5abeed02b2..dc56cb4642c4 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 = {
@@ -25,6 +27,14 @@ type DirectionProps = {
     coordinates: Array<[number, number]>;
 };
 
+type PendingMapViewProps = {
+    /** Title message below the icon */
+    title?: string;
+
+    /** Subtitle message below the title */
+    subtitle?: string;
+};
+
 // Initial state of the map
 type InitialState = {
     // Coordinate on which to center the map
@@ -53,4 +63,4 @@ type MapViewHandle = {
     fitBounds: (ne: [number, number], sw: [number, number], paddingConfig?: number | number[], animationDuration?: number) => void;
 };
 
-export type {DirectionStyle, WayPoint, MapViewProps, DirectionProps, MapViewHandle};
+export type {DirectionStyle, WayPoint, MapViewProps, DirectionProps, PendingMapViewProps, MapViewHandle};
diff --git a/src/components/MapView/PendingMapView.tsx b/src/components/MapView/PendingMapView.tsx
new file mode 100644
index 000000000000..6a35d2a9c369
--- /dev/null
+++ b/src/components/MapView/PendingMapView.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import {View} from 'react-native';
+import _ from 'lodash';
+import variables from '../../styles/variables';
+import styles from '../../styles/styles';
+import Icon from '../Icon';
+import {PendingMapViewProps} from './MapViewTypes';
+import BlockingView from '../BlockingViews/BlockingView';
+import * as Expensicons from '../Icon/Expensicons';
+
+function PendingMapView({title = '', subtitle = ''}: PendingMapViewProps) {
+    const hasTextContent = !_.isEmpty(title) || !_.isEmpty(subtitle);
+
+    return (
+        <View style={[styles.mapPendingView]}>
+            {hasTextContent ? (
+                <BlockingView
+                    icon={Expensicons.EmptyStateRoutePending}
+                    title={title}
+                    subtitle={subtitle}
+                    shouldShowLink={false}
+                />
+            ) : (
+                <View style={[styles.flex1, styles.alignItemsCenter, styles.justifyContentCenter, styles.ph10]}>
+                    <Icon
+                        src={Expensicons.EmptyStateRoutePending}
+                        width={variables.iconSizeUltraLarge}
+                        height={variables.iconSizeUltraLarge}
+                    />
+                </View>
+            )}
+        </View>
+    );
+}
+
+export default PendingMapView;
diff --git a/src/components/MapView/responder/index.android.ts b/src/components/MapView/responder/index.android.ts
new file mode 100644
index 000000000000..a0fce71d8ef5
--- /dev/null
+++ b/src/components/MapView/responder/index.android.ts
@@ -0,0 +1,8 @@
+import {PanResponder} from 'react-native';
+
+const responder = PanResponder.create({
+    onStartShouldSetPanResponder: () => true,
+    onPanResponderTerminationRequest: () => false,
+});
+
+export default responder;
diff --git a/src/components/MapView/responder/index.ts b/src/components/MapView/responder/index.ts
index a0fce71d8ef5..422d6c1b4963 100644
--- a/src/components/MapView/responder/index.ts
+++ b/src/components/MapView/responder/index.ts
@@ -1,7 +1,7 @@
 import {PanResponder} from 'react-native';
 
 const responder = PanResponder.create({
-    onStartShouldSetPanResponder: () => true,
+    onMoveShouldSetPanResponder: () => true,
     onPanResponderTerminationRequest: () => false,
 });
 
diff --git a/src/components/MentionSuggestions.js b/src/components/MentionSuggestions.js
index 4b0129635269..6c0803ca9d64 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';
@@ -40,9 +41,6 @@ const propTypes = {
      * When this value is false, the suggester will have a height of 2.5 items. When this value is true, the height can be up to 5 items.  */
     isMentionPickerLarge: PropTypes.bool.isRequired,
 
-    /** Show that we should include ReportRecipientLocalTime view height */
-    shouldIncludeReportRecipientLocalTimeHeight: PropTypes.bool.isRequired,
-
     /** Meaures the parent container's position and dimensions. */
     measureParentContainer: PropTypes.func,
 };
@@ -79,7 +77,8 @@ 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}
+                        fallbackIcon={item.icons[0].fallbackIcon}
                     />
                 </View>
                 <Text
@@ -124,7 +123,6 @@ function MentionSuggestions(props) {
             highlightedSuggestionIndex={props.highlightedMentionIndex}
             onSelect={props.onSelect}
             isSuggestionPickerLarge={props.isMentionPickerLarge}
-            shouldIncludeReportRecipientLocalTimeHeight={props.shouldIncludeReportRecipientLocalTimeHeight}
             accessibilityLabelExtractor={keyExtractor}
             measureParentContainer={props.measureParentContainer}
         />
diff --git a/src/components/MenuItem.js b/src/components/MenuItem.js
index adf3fa0cdd80..11f7d547962b 100644
--- a/src/components/MenuItem.js
+++ b/src/components/MenuItem.js
@@ -1,6 +1,7 @@
 import _ from 'underscore';
-import React from 'react';
+import React, {useEffect, useMemo} from 'react';
 import {View} from 'react-native';
+import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import Text from './Text';
 import styles from '../styles/styles';
 import themeColors from '../styles/themes/default';
@@ -14,7 +15,6 @@ import Badge from './Badge';
 import CONST from '../CONST';
 import menuItemPropTypes from './menuItemPropTypes';
 import SelectCircle from './SelectCircle';
-import colors from '../styles/colors';
 import MultipleAvatars from './MultipleAvatars';
 import * as defaultWorkspaceAvatars from './Icon/WorkspaceDefaultAvatars';
 import PressableWithSecondaryInteraction from './PressableWithSecondaryInteraction';
@@ -24,6 +24,7 @@ import variables from '../styles/variables';
 import * as Session from '../libs/actions/Session';
 import Hoverable from './Hoverable';
 import useWindowDimensions from '../hooks/useWindowDimensions';
+import MenuItemRenderHTMLTitle from './MenuItemRenderHTMLTitle';
 
 const propTypes = menuItemPropTypes;
 
@@ -34,6 +35,7 @@ const defaultProps = {
     shouldShowBasicTitle: false,
     shouldShowDescriptionOnTop: false,
     shouldShowHeaderTitle: false,
+    shouldParseTitle: false,
     wrapperStyle: [],
     style: styles.popoverMenuItem,
     titleStyle: {},
@@ -54,7 +56,6 @@ const defaultProps = {
     disabled: false,
     isSelected: false,
     subtitle: undefined,
-    subtitleTextStyle: {},
     iconType: CONST.ICON_TYPE_ICON,
     onPress: () => {},
     onSecondaryInteraction: undefined,
@@ -74,10 +75,13 @@ const defaultProps = {
     title: '',
     numberOfLinesTitle: 1,
     shouldGreyOutWhenDisabled: true,
+    error: '',
+    shouldRenderAsHTML: false,
 };
 
 const MenuItem = React.forwardRef((props, ref) => {
     const {isSmallScreenWidth} = useWindowDimensions();
+    const [html, setHtml] = React.useState('');
 
     const isDeleted = _.contains(props.style, styles.offlineFeedback.deleted);
     const descriptionVerticalMargin = props.shouldShowDescriptionOnTop ? styles.mb1 : styles.mt1;
@@ -105,6 +109,28 @@ const MenuItem = React.forwardRef((props, ref) => {
 
     const fallbackAvatarSize = props.viewMode === CONST.OPTION_MODE.COMPACT ? CONST.AVATAR_SIZE.SMALL : CONST.AVATAR_SIZE.DEFAULT;
 
+    const titleRef = React.useRef('');
+    useEffect(() => {
+        if (!props.title || (titleRef.current.length && titleRef.current === props.title) || !props.shouldParseTitle) {
+            return;
+        }
+        const parser = new ExpensiMark();
+        setHtml(parser.replace(convertToLTR(props.title)));
+        titleRef.current = props.title;
+    }, [props.title, props.shouldParseTitle]);
+
+    const getProcessedTitle = useMemo(() => {
+        if (props.shouldRenderAsHTML) {
+            return convertToLTR(props.title);
+        }
+
+        if (props.shouldParseTitle) {
+            return html;
+        }
+
+        return '';
+    }, [props.title, props.shouldRenderAsHTML, props.shouldParseTitle, html]);
+
     return (
         <Hoverable>
             {(isHovered) => (
@@ -221,10 +247,14 @@ const MenuItem = React.forwardRef((props, ref) => {
                                             </Text>
                                         )}
                                         <View style={[styles.flexRow, styles.alignItemsCenter]}>
-                                            {Boolean(props.title) && (
+                                            {Boolean(props.title) && (Boolean(props.shouldRenderAsHTML) || (Boolean(props.shouldParseTitle) && Boolean(html.length))) && (
+                                                <MenuItemRenderHTMLTitle title={getProcessedTitle} />
+                                            )}
+                                            {!props.shouldRenderAsHTML && !props.shouldParseTitle && Boolean(props.title) && (
                                                 <Text
                                                     style={titleTextStyle}
                                                     numberOfLines={props.numberOfLinesTitle || undefined}
+                                                    dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: props.interactive && props.disabled}}
                                                 >
                                                     {convertToLTR(props.title)}
                                                 </Text>
@@ -246,6 +276,11 @@ const MenuItem = React.forwardRef((props, ref) => {
                                                 {props.description}
                                             </Text>
                                         )}
+                                        {Boolean(props.error) && (
+                                            <View style={[styles.mt1]}>
+                                                <Text style={[styles.textLabelError]}>{props.error}</Text>
+                                            </View>
+                                        )}
                                         {Boolean(props.furtherDetails) && (
                                             <View style={[styles.flexRow, styles.mt1, styles.alignItemsCenter]}>
                                                 <Icon
@@ -279,7 +314,7 @@ const MenuItem = React.forwardRef((props, ref) => {
                                 {/* Since subtitle can be of type number, we should allow 0 to be shown */}
                                 {(props.subtitle || props.subtitle === 0) && (
                                     <View style={[styles.justifyContentCenter, styles.mr1]}>
-                                        <Text style={[props.subtitleTextStyle || styles.textLabelSupporting, props.style]}>{props.subtitle}</Text>
+                                        <Text style={[styles.textLabelSupporting, props.style]}>{props.subtitle}</Text>
                                     </View>
                                 )}
                                 {!_.isEmpty(props.floatRightAvatars) && (
@@ -298,7 +333,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/MenuItemRenderHTMLTitle/index.js b/src/components/MenuItemRenderHTMLTitle/index.js
new file mode 100644
index 000000000000..f91e70dc1249
--- /dev/null
+++ b/src/components/MenuItemRenderHTMLTitle/index.js
@@ -0,0 +1,23 @@
+import React from 'react';
+import {View} from 'react-native';
+import styles from '../../styles/styles';
+import RenderHTML from '../RenderHTML';
+import menuItemRenderHTMLTitlePropTypes from './propTypes';
+
+const propTypes = menuItemRenderHTMLTitlePropTypes;
+
+const defaultProps = {};
+
+function MenuItemRenderHTMLTitle(props) {
+    return (
+        <View style={styles.renderHTMLTitle}>
+            <RenderHTML html={props.title} />
+        </View>
+    );
+}
+
+MenuItemRenderHTMLTitle.propTypes = propTypes;
+MenuItemRenderHTMLTitle.defaultProps = defaultProps;
+MenuItemRenderHTMLTitle.displayName = 'MenuItemRenderHTMLTitle';
+
+export default MenuItemRenderHTMLTitle;
diff --git a/src/components/MenuItemRenderHTMLTitle/index.native.js b/src/components/MenuItemRenderHTMLTitle/index.native.js
new file mode 100644
index 000000000000..b3dff8d77eff
--- /dev/null
+++ b/src/components/MenuItemRenderHTMLTitle/index.native.js
@@ -0,0 +1,17 @@
+import React from 'react';
+import RenderHTML from '../RenderHTML';
+import menuItemRenderHTMLTitlePropTypes from './propTypes';
+
+const propTypes = menuItemRenderHTMLTitlePropTypes;
+
+const defaultProps = {};
+
+function MenuItemRenderHTMLTitle(props) {
+    return <RenderHTML html={props.title} />;
+}
+
+MenuItemRenderHTMLTitle.propTypes = propTypes;
+MenuItemRenderHTMLTitle.defaultProps = defaultProps;
+MenuItemRenderHTMLTitle.displayName = 'MenuItemRenderHTMLTitle';
+
+export default MenuItemRenderHTMLTitle;
diff --git a/src/components/MenuItemRenderHTMLTitle/propTypes.js b/src/components/MenuItemRenderHTMLTitle/propTypes.js
new file mode 100644
index 000000000000..68e279eb28c3
--- /dev/null
+++ b/src/components/MenuItemRenderHTMLTitle/propTypes.js
@@ -0,0 +1,8 @@
+import PropTypes from 'prop-types';
+
+const propTypes = {
+    /** Processed title to display for the MenuItem */
+    title: PropTypes.string.isRequired,
+};
+
+export default propTypes;
diff --git a/src/components/Modal/BaseModal.js b/src/components/Modal/BaseModal.js
index ab9d420f949c..051c4ba3f80a 100644
--- a/src/components/Modal/BaseModal.js
+++ b/src/components/Modal/BaseModal.js
@@ -1,4 +1,4 @@
-import React, {forwardRef, useCallback, useEffect, useMemo} from 'react';
+import React, {forwardRef, useCallback, useEffect, useMemo, useRef} from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import ReactNativeModal from 'react-native-modal';
@@ -13,6 +13,8 @@ import useWindowDimensions from '../../hooks/useWindowDimensions';
 import variables from '../../styles/variables';
 import CONST from '../../CONST';
 import ComposerFocusManager from '../../libs/ComposerFocusManager';
+import useNativeDriver from '../../libs/useNativeDriver';
+import usePrevious from '../../hooks/usePrevious';
 
 const propTypes = {
     ...modalPropTypes,
@@ -40,7 +42,7 @@ function BaseModal({
     fullscreen,
     animationIn,
     animationOut,
-    useNativeDriver,
+    useNativeDriver: useNativeDriverProp,
     hideModalContentWhileAnimating,
     animationInTiming,
     animationOutTiming,
@@ -54,6 +56,9 @@ function BaseModal({
 
     const safeAreaInsets = useSafeAreaInsets();
 
+    const isVisibleRef = useRef(isVisible);
+    const wasVisible = usePrevious(isVisible);
+
     /**
      * Hides modal
      * @param {Boolean} [callHideCallback=true] Should we call the onModalHide callback
@@ -75,20 +80,25 @@ function BaseModal({
     );
 
     useEffect(() => {
-        Modal.willAlertModalBecomeVisible(isVisible);
-
-        // To handle closing any modal already visible when this modal is mounted, i.e. PopoverReportActionContextMenu
-        Modal.setCloseModal(isVisible ? onClose : null);
-    }, [isVisible, onClose]);
+        isVisibleRef.current = isVisible;
+        if (isVisible) {
+            Modal.willAlertModalBecomeVisible(true);
+            // To handle closing any modal already visible when this modal is mounted, i.e. PopoverReportActionContextMenu
+            Modal.setCloseModal(onClose);
+        } else if (wasVisible && !isVisible) {
+            Modal.willAlertModalBecomeVisible(false);
+            Modal.setCloseModal(null);
+        }
+    }, [isVisible, wasVisible, onClose]);
 
     useEffect(
         () => () => {
             // Only trigger onClose and setModalVisibility if the modal is unmounting while visible.
-            if (isVisible) {
-                hideModal(true);
-                Modal.willAlertModalBecomeVisible(false);
+            if (!isVisibleRef.current) {
+                return;
             }
-
+            hideModal(true);
+            Modal.willAlertModalBecomeVisible(false);
             // To prevent closing any modal already unmounted when this modal still remains as visible state
             Modal.setCloseModal(null);
         },
@@ -187,7 +197,7 @@ function BaseModal({
             deviceWidth={windowWidth}
             animationIn={animationIn || modalStyleAnimationIn}
             animationOut={animationOut || modalStyleAnimationOut}
-            useNativeDriver={useNativeDriver}
+            useNativeDriver={useNativeDriverProp && useNativeDriver}
             hideModalContentWhileAnimating={hideModalContentWhileAnimating}
             animationInTiming={animationInTiming}
             animationOutTiming={animationOutTiming}
diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index 7e6cc78ebd13..3ccd61d32961 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -69,8 +69,8 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
     const isManager = ReportUtils.isMoneyRequestReport(moneyRequestReport) && lodashGet(session, 'accountID', null) === moneyRequestReport.managerID;
     const isPayer = policyType === CONST.POLICY.TYPE.CORPORATE ? isPolicyAdmin && isApproved : isPolicyAdmin || (ReportUtils.isMoneyRequestReport(moneyRequestReport) && isManager);
     const shouldShowSettlementButton = useMemo(
-        () => isPayer && !isSettled && !moneyRequestReport.isWaitingOnBankAccount && reportTotal !== 0,
-        [isPayer, isSettled, moneyRequestReport, reportTotal],
+        () => isPayer && !isSettled && !moneyRequestReport.isWaitingOnBankAccount && reportTotal !== 0 && !ReportUtils.isArchivedRoom(chatReport),
+        [isPayer, isSettled, moneyRequestReport, reportTotal, chatReport],
     );
     const shouldShowApproveButton = useMemo(() => {
         if (policyType !== CONST.POLICY.TYPE.CORPORATE) {
@@ -79,7 +79,6 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
         return isManager && !isApproved && !isSettled;
     }, [policyType, isManager, isApproved, isSettled]);
     const bankAccountRoute = ReportUtils.getBankAccountRoute(chatReport);
-    const shouldShowPaypal = Boolean(lodashGet(personalDetails, [moneyRequestReport.managerID, 'payPalMeAddress']));
     const formattedAmount = CurrencyUtils.convertToDisplayString(reportTotal, moneyRequestReport.currency);
 
     return (
@@ -99,11 +98,10 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
                         <SettlementButton
                             currency={moneyRequestReport.currency}
                             policyID={moneyRequestReport.policyID}
-                            shouldShowPaypal={shouldShowPaypal}
                             chatReportID={chatReport.reportID}
                             iouReport={moneyRequestReport}
                             onPress={(paymentType) => IOU.payMoneyRequest(paymentType, chatReport, moneyRequestReport)}
-                            enablePaymentsRoute={ROUTES.BANK_ACCOUNT_NEW}
+                            enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
                             addBankAccountRoute={bankAccountRoute}
                             shouldShowPaymentOptions
                             style={[styles.pv2]}
@@ -128,11 +126,10 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
                     <SettlementButton
                         currency={moneyRequestReport.currency}
                         policyID={moneyRequestReport.policyID}
-                        shouldShowPaypal={shouldShowPaypal}
                         chatReportID={moneyRequestReport.chatReportID}
                         iouReport={moneyRequestReport}
                         onPress={(paymentType) => IOU.payMoneyRequest(paymentType, chatReport, moneyRequestReport)}
-                        enablePaymentsRoute={ROUTES.BANK_ACCOUNT_NEW}
+                        enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
                         addBankAccountRoute={bankAccountRoute}
                         shouldShowPaymentOptions
                         formattedAmount={formattedAmount}
diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index a7695c939907..695d935d7183 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -5,9 +5,11 @@ import {format} from 'date-fns';
 import _ from 'underscore';
 import {View} from 'react-native';
 import lodashGet from 'lodash/get';
+import Text from './Text';
 import styles from '../styles/styles';
 import * as ReportUtils from '../libs/ReportUtils';
 import * as OptionsListUtils from '../libs/OptionsListUtils';
+import Permissions from '../libs/Permissions';
 import OptionsSelector from './OptionsSelector';
 import ONYXKEYS from '../ONYXKEYS';
 import compose from '../libs/compose';
@@ -29,10 +31,14 @@ import Image from './Image';
 import useLocalize from '../hooks/useLocalize';
 import * as ReceiptUtils from '../libs/ReceiptUtils';
 import categoryPropTypes from './categoryPropTypes';
+import Switch from './Switch';
+import tagPropTypes from './tagPropTypes';
 import ConfirmedRoute from './ConfirmedRoute';
 import transactionPropTypes from './transactionPropTypes';
 import DistanceRequestUtils from '../libs/DistanceRequestUtils';
 import * as IOU from '../libs/actions/IOU';
+import * as TransactionUtils from '../libs/TransactionUtils';
+import * as PolicyUtils from '../libs/PolicyUtils';
 
 const propTypes = {
     /** Callback to inform parent modal of success */
@@ -68,6 +74,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 +99,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 +117,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 +137,13 @@ 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: tagPropTypes,
 };
 
 const defaultProps = {
@@ -137,6 +152,7 @@ const defaultProps = {
     onSelectParticipant: () => {},
     iouType: CONST.IOU.MONEY_REQUEST_TYPE.REQUEST,
     iouCategory: '',
+    iouTag: '',
     payeePersonalDetails: null,
     canModifyParticipants: false,
     isReadOnly: false,
@@ -144,6 +160,7 @@ const defaultProps = {
     session: {
         email: null,
     },
+    betas: [],
     policyID: '',
     reportID: '',
     ...withCurrentUserPersonalDetailsDefaultProps,
@@ -151,6 +168,7 @@ const defaultProps = {
     receiptSource: '',
     listStyles: [],
     policyCategories: {},
+    policyTags: {},
     transactionID: '',
     transaction: {},
     mileageRate: {unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES, rate: 0, currency: 'USD'},
@@ -161,7 +179,7 @@ function MoneyRequestConfirmationList(props) {
     // Destructure functions from props to pass it as a dependecy to useCallback/useMemo hooks.
     // Prop functions pass props itself as a "this" value to the function which means they change every time props change.
     const {onSendMoney, onConfirm, onSelectParticipant, transaction} = props;
-    const {translate} = useLocalize();
+    const {translate, toLocaleDigit} = useLocalize();
 
     // A flag and a toggler for showing the rest of the form fields
     const [shouldExpandFields, toggleShouldExpandFields] = useReducer((state) => !state, false);
@@ -171,12 +189,32 @@ 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 formattedAmount = CurrencyUtils.convertToDisplayString(
-        shouldCalculateDistanceAmount ? DistanceRequestUtils.getDistanceRequestAmount(distance, unit, rate) : props.iouAmount,
-        props.isDistanceRequest ? currency : props.iouCurrencyCode,
-    );
+    // A flag for verifying that the current report is a sub-report of a workspace chat
+    const isPolicyExpenseChat = useMemo(() => ReportUtils.isPolicyExpenseChat(ReportUtils.getRootParentReport(ReportUtils.getReport(props.reportID))), [props.reportID]);
+
+    // A flag for showing the categories field
+    const shouldShowCategories = isPolicyExpenseChat && Permissions.canUseCategories(props.betas) && OptionsListUtils.hasEnabledOptions(_.values(props.policyCategories));
+
+    // Fetches the first tag list of the policy
+    const policyTag = PolicyUtils.getTag(props.policyTags);
+    const policyTagList = lodashGet(policyTag, 'tags', {});
+    const policyTagListName = lodashGet(policyTag, 'name', translate('common.tag'));
+    const canUseTags = Permissions.canUseTags(props.betas);
+    // A flag for showing the tags field
+    const shouldShowTags = isPolicyExpenseChat && canUseTags && OptionsListUtils.hasEnabledOptions(_.values(policyTagList));
+
+    // A flag for showing the billable field
+    const shouldShowBillable = canUseTags && !lodashGet(props.policy, 'disabledFields.defaultBillable', true);
+
+    const hasRoute = TransactionUtils.hasRoute(transaction);
+    const isDistanceRequestWithoutRoute = props.isDistanceRequest && !hasRoute;
+    const formattedAmount = isDistanceRequestWithoutRoute
+        ? translate('common.tbd')
+        : CurrencyUtils.convertToDisplayString(
+              shouldCalculateDistanceAmount ? DistanceRequestUtils.getDistanceRequestAmount(distance, unit, rate) : props.iouAmount,
+              props.isDistanceRequest ? currency : props.iouCurrencyCode,
+          );
 
     useEffect(() => {
         if (!shouldCalculateDistanceAmount) {
@@ -204,7 +242,7 @@ function MoneyRequestConfirmationList(props) {
 
     const splitOrRequestOptions = useMemo(() => {
         let text;
-        if (props.receiptPath) {
+        if (props.receiptPath || isDistanceRequestWithoutRoute) {
             text = translate('iou.request');
         } else {
             const translationKey = props.hasMultipleParticipants ? 'iou.splitAmount' : 'iou.requestAmount';
@@ -216,7 +254,7 @@ function MoneyRequestConfirmationList(props) {
                 value: props.hasMultipleParticipants ? CONST.IOU.MONEY_REQUEST_TYPE.SPLIT : CONST.IOU.MONEY_REQUEST_TYPE.REQUEST,
             },
         ];
-    }, [props.hasMultipleParticipants, props.receiptPath, translate, formattedAmount]);
+    }, [props.hasMultipleParticipants, props.receiptPath, translate, formattedAmount, isDistanceRequestWithoutRoute]);
 
     const selectedParticipants = useMemo(() => _.filter(props.selectedParticipants, (participant) => participant.selected), [props.selectedParticipants]);
     const payeePersonalDetails = useMemo(() => props.payeePersonalDetails || props.currentUserPersonalDetails, [props.payeePersonalDetails, props.currentUserPersonalDetails]);
@@ -295,9 +333,9 @@ function MoneyRequestConfirmationList(props) {
         if (!props.isDistanceRequest) {
             return;
         }
-        const distanceMerchant = DistanceRequestUtils.getDistanceMerchant(distance, unit, rate, currency, translate);
+        const distanceMerchant = DistanceRequestUtils.getDistanceMerchant(hasRoute, distance, unit, rate, currency, translate, toLocaleDigit);
         IOU.setMoneyRequestMerchant(distanceMerchant);
-    }, [distance, unit, rate, currency, translate, props.isDistanceRequest]);
+    }, [hasRoute, distance, unit, rate, currency, translate, toLocaleDigit, props.isDistanceRequest]);
 
     /**
      * @param {Object} option
@@ -321,9 +359,9 @@ function MoneyRequestConfirmationList(props) {
         if (option.accountID) {
             const activeRoute = Navigation.getActiveRoute().replace(/\?.*/, '');
 
-            Navigation.navigate(ROUTES.getProfileRoute(option.accountID, activeRoute));
+            Navigation.navigate(ROUTES.PROFILE.getRoute(option.accountID, activeRoute));
         } else if (option.reportID) {
-            Navigation.navigate(ROUTES.getReportDetailsRoute(option.reportID));
+            Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(option.reportID));
         }
     };
 
@@ -359,13 +397,11 @@ function MoneyRequestConfirmationList(props) {
 
         const shouldShowSettlementButton = props.iouType === CONST.IOU.MONEY_REQUEST_TYPE.SEND;
         const shouldDisableButton = selectedParticipants.length === 0;
-        const recipient = props.selectedParticipants[0] || {};
 
         return shouldShowSettlementButton ? (
             <SettlementButton
                 isDisabled={shouldDisableButton}
                 onPress={confirm}
-                shouldShowPaypal={Boolean(recipient && recipient.payPalMeAddress)}
                 enablePaymentsRoute={ROUTES.IOU_SEND_ENABLE_PAYMENTS}
                 addBankAccountRoute={props.bankAccountRoute}
                 addDebitCardRoute={ROUTES.IOU_SEND_ADD_DEBIT_CARD}
@@ -386,13 +422,14 @@ function MoneyRequestConfirmationList(props) {
                 buttonSize={CONST.DROPDOWN_BUTTON_SIZE.LARGE}
             />
         );
-    }, [confirm, props.selectedParticipants, props.bankAccountRoute, props.iouCurrencyCode, props.iouType, props.isReadOnly, props.policyID, selectedParticipants, splitOrRequestOptions]);
+    }, [confirm, props.bankAccountRoute, props.iouCurrencyCode, props.iouType, props.isReadOnly, props.policyID, selectedParticipants, splitOrRequestOptions]);
 
     return (
         <OptionsSelector
             sections={optionSelectorSections}
             value=""
             onSelectRow={canModifyParticipants ? selectParticipant : navigateToReportOrUserDetail}
+            onAddToSelection={selectParticipant}
             onConfirmSelection={confirm}
             selectedOptions={selectedOptions}
             canSelectMultipleOptions={canModifyParticipants}
@@ -421,7 +458,7 @@ function MoneyRequestConfirmationList(props) {
                     shouldShowRightIcon={!props.isReadOnly && !props.isDistanceRequest}
                     title={formattedAmount}
                     description={translate('iou.amount')}
-                    onPress={() => !props.isDistanceRequest && Navigation.navigate(ROUTES.getMoneyRequestAmountRoute(props.iouType, props.reportID))}
+                    onPress={() => !props.isDistanceRequest && Navigation.navigate(ROUTES.MONEY_REQUEST_AMOUNT.getRoute(props.iouType, props.reportID))}
                     style={[styles.moneyRequestMenuItem, styles.mt2]}
                     titleStyle={styles.moneyRequestConfirmationAmount}
                     disabled={didConfirm || props.isReadOnly}
@@ -429,9 +466,10 @@ function MoneyRequestConfirmationList(props) {
             )}
             <MenuItemWithTopDescription
                 shouldShowRightIcon={!props.isReadOnly}
+                shouldParseTitle
                 title={props.iouComment}
                 description={translate('common.description')}
-                onPress={() => Navigation.navigate(ROUTES.getMoneyRequestDescriptionRoute(props.iouType, props.reportID))}
+                onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_DESCRIPTION.getRoute(props.iouType, props.reportID))}
                 style={[styles.moneyRequestMenuItem, styles.mb2]}
                 titleStyle={styles.flex1}
                 disabled={didConfirm || props.isReadOnly}
@@ -460,7 +498,7 @@ function MoneyRequestConfirmationList(props) {
                         description={translate('common.date')}
                         style={[styles.moneyRequestMenuItem, styles.mb2]}
                         titleStyle={styles.flex1}
-                        onPress={() => Navigation.navigate(ROUTES.getMoneyRequestCreatedRoute(props.iouType, props.reportID))}
+                        onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_DATE.getRoute(props.iouType, props.reportID))}
                         disabled={didConfirm || props.isReadOnly || !isTypeRequest}
                     />
                     {props.isDistanceRequest ? (
@@ -470,7 +508,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.MONEY_REQUEST_DISTANCE.getRoute(props.iouType, props.reportID))}
                             disabled={didConfirm || props.isReadOnly || !isTypeRequest}
                         />
                     ) : (
@@ -480,20 +518,40 @@ function MoneyRequestConfirmationList(props) {
                             description={translate('common.merchant')}
                             style={[styles.moneyRequestMenuItem, styles.mb2]}
                             titleStyle={styles.flex1}
-                            onPress={() => Navigation.navigate(ROUTES.getMoneyRequestMerchantRoute(props.iouType, props.reportID))}
+                            onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_MERCHANT.getRoute(props.iouType, props.reportID))}
                             disabled={didConfirm || props.isReadOnly || !isTypeRequest}
                         />
                     )}
-                    {shouldCategoryEditable && (
+                    {shouldShowCategories && (
                         <MenuItemWithTopDescription
                             shouldShowRightIcon={!props.isReadOnly}
                             title={props.iouCategory}
                             description={translate('common.category')}
-                            onPress={() => Navigation.navigate(ROUTES.getMoneyRequestCategoryRoute(props.iouType, props.reportID))}
+                            onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_CATEGORY.getRoute(props.iouType, props.reportID))}
                             style={[styles.moneyRequestMenuItem, styles.mb2]}
                             disabled={didConfirm || props.isReadOnly}
                         />
                     )}
+                    {shouldShowTags && (
+                        <MenuItemWithTopDescription
+                            shouldShowRightIcon={!props.isReadOnly}
+                            title={props.iouTag}
+                            description={policyTagListName}
+                            onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_TAG.getRoute(props.iouType, props.reportID))}
+                            style={[styles.moneyRequestMenuItem, styles.mb2]}
+                            disabled={didConfirm || props.isReadOnly}
+                        />
+                    )}
+                    {shouldShowBillable && (
+                        <View style={[styles.flexRow, styles.mb4, styles.justifyContentBetween, styles.alignItemsCenter, styles.ml5, styles.mr8]}>
+                            <Text color={!props.iouIsBillable ? themeColors.textSupporting : undefined}>{translate('common.billable')}</Text>
+                            <Switch
+                                accessibilityLabel={translate('common.billable')}
+                                isOn={props.iouIsBillable}
+                                onToggle={props.onToggleBillable}
+                            />
+                        </View>
+                    )}
                 </>
             )}
         </OptionsSelector>
@@ -509,9 +567,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,
@@ -519,5 +583,8 @@ export default compose(
         transaction: {
             key: ({transactionID}) => `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
         },
+        policy: {
+            key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+        },
     }),
 )(MoneyRequestConfirmationList);
diff --git a/src/components/MoneyRequestHeader.js b/src/components/MoneyRequestHeader.js
index f04a41ae1153..9db9c87c4eb1 100644
--- a/src/components/MoneyRequestHeader.js
+++ b/src/components/MoneyRequestHeader.js
@@ -9,25 +9,23 @@ import * as ReportUtils from '../libs/ReportUtils';
 import * as Expensicons from './Icon/Expensicons';
 import participantPropTypes from './participantPropTypes';
 import styles from '../styles/styles';
-import withWindowDimensions, {windowDimensionsPropTypes} from './withWindowDimensions';
-import compose from '../libs/compose';
 import Navigation from '../libs/Navigation/Navigation';
 import ROUTES from '../ROUTES';
+import CONST from '../CONST';
 import ONYXKEYS from '../ONYXKEYS';
 import * as IOU from '../libs/actions/IOU';
-import * as ReportActionsUtils from '../libs/ReportActionsUtils';
 import ConfirmModal from './ConfirmModal';
 import useLocalize from '../hooks/useLocalize';
 import MoneyRequestHeaderStatusBar from './MoneyRequestHeaderStatusBar';
 import * as TransactionUtils from '../libs/TransactionUtils';
+import reportActionPropTypes from '../pages/home/report/reportActionPropTypes';
+import transactionPropTypes from './transactionPropTypes';
+import useWindowDimensions from '../hooks/useWindowDimensions';
 
 const propTypes = {
     /** The report currently being looked at */
     report: iouReportPropTypes.isRequired,
 
-    /** The expense report or iou report (only will have a value if this is a transaction thread) */
-    parentReport: iouReportPropTypes,
-
     /** The policy which the report is tied to */
     policy: PropTypes.shape({
         /** Name of the policy */
@@ -37,13 +35,21 @@ const propTypes = {
     /** Personal details so we can get the ones for the report participants */
     personalDetails: PropTypes.objectOf(participantPropTypes).isRequired,
 
+    /* Onyx Props */
     /** Session info for the currently logged in user. */
     session: PropTypes.shape({
         /** Currently logged in user email */
         email: PropTypes.string,
     }),
 
-    ...windowDimensionsPropTypes,
+    /** The expense report or iou report (only will have a value if this is a transaction thread) */
+    parentReport: iouReportPropTypes,
+
+    /** The report action the transaction is tied to from the parent report */
+    parentReportAction: PropTypes.shape(reportActionPropTypes),
+
+    /** All the data for the transaction */
+    transaction: transactionPropTypes,
 };
 
 const defaultProps = {
@@ -51,28 +57,25 @@ const defaultProps = {
         email: null,
     },
     parentReport: {},
+    parentReportAction: {},
+    transaction: {},
 };
 
-function MoneyRequestHeader(props) {
+function MoneyRequestHeader({session, parentReport, report, parentReportAction, transaction, policy, personalDetails}) {
     const {translate} = useLocalize();
     const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
-    const moneyRequestReport = props.parentReport;
+    const moneyRequestReport = parentReport;
     const isSettled = ReportUtils.isSettled(moneyRequestReport.reportID);
-
-    const parentReportAction = ReportActionsUtils.getParentReportAction(props.report);
+    const {isSmallScreenWidth, windowWidth} = useWindowDimensions();
 
     // Only the requestor can take delete the request, admins can only edit it.
-    const isActionOwner = parentReportAction.actorAccountID === lodashGet(props.session, 'accountID', null);
-    const report = props.report;
-    report.ownerAccountID = lodashGet(props, ['parentReport', 'ownerAccountID'], null);
-    report.ownerEmail = lodashGet(props, ['parentReport', 'ownerEmail'], '');
+    const isActionOwner = lodashGet(parentReportAction, 'actorAccountID') === lodashGet(session, 'accountID', null);
 
     const deleteTransaction = useCallback(() => {
-        IOU.deleteMoneyRequest(parentReportAction.originalMessage.IOUTransactionID, parentReportAction, true);
+        IOU.deleteMoneyRequest(lodashGet(parentReportAction, 'originalMessage.IOUTransactionID'), parentReportAction, true);
         setIsDeleteModalVisible(false);
     }, [parentReportAction, setIsDeleteModalVisible]);
 
-    const transaction = TransactionUtils.getLinkedTransaction(parentReportAction);
     const isScanning = TransactionUtils.hasReceipt(transaction) && TransactionUtils.isReceiptBeingScanned(transaction);
 
     return (
@@ -83,17 +86,30 @@ function MoneyRequestHeader(props) {
                     shouldShowPinButton={false}
                     shouldShowThreeDotsButton={isActionOwner && !isSettled}
                     threeDotsMenuItems={[
+                        ...(TransactionUtils.hasReceipt(transaction)
+                            ? []
+                            : [
+                                  {
+                                      icon: Expensicons.Receipt,
+                                      text: translate('receipt.addReceipt'),
+                                      onSelected: () => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.RECEIPT)),
+                                  },
+                              ]),
                         {
                             icon: Expensicons.Trashcan,
                             text: translate('reportActionContextMenu.deleteAction', {action: parentReportAction}),
                             onSelected: () => setIsDeleteModalVisible(true),
                         },
                     ]}
-                    threeDotsAnchorPosition={styles.threeDotsPopoverOffsetNoCloseButton(props.windowWidth)}
-                    report={report}
-                    policy={props.policy}
-                    personalDetails={props.personalDetails}
-                    shouldShowBackButton={props.isSmallScreenWidth}
+                    threeDotsAnchorPosition={styles.threeDotsPopoverOffsetNoCloseButton(windowWidth)}
+                    report={{
+                        ...report,
+                        ownerAccountID: lodashGet(parentReport, 'ownerAccountID', null),
+                        ownerEmail: lodashGet(parentReport, 'ownerEmail', null),
+                    }}
+                    policy={policy}
+                    personalDetails={personalDetails}
+                    shouldShowBackButton={isSmallScreenWidth}
                     onBackButtonPress={() => Navigation.goBack(ROUTES.HOME, false, true)}
                 />
                 {isScanning && <MoneyRequestHeaderStatusBar />}
@@ -116,14 +132,19 @@ MoneyRequestHeader.displayName = 'MoneyRequestHeader';
 MoneyRequestHeader.propTypes = propTypes;
 MoneyRequestHeader.defaultProps = defaultProps;
 
-export default compose(
-    withWindowDimensions,
-    withOnyx({
-        session: {
-            key: ONYXKEYS.SESSION,
-        },
-        parentReport: {
-            key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`,
-        },
-    }),
-)(MoneyRequestHeader);
+export default withOnyx({
+    session: {
+        key: ONYXKEYS.SESSION,
+    },
+    parentReport: {
+        key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`,
+    },
+    parentReportAction: {
+        key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${(report.parentReportID, report.parentReportActionID)}`,
+        selector: (reportActions, props) => props && props.parentReport && reportActions && reportActions[props.parentReport.parentReportActionID],
+        canEvict: false,
+    },
+    transaction: {
+        key: ({parentReportAction}) => `${ONYXKEYS.COLLECTION.TRANSACTION}${lodashGet(parentReportAction, 'originalMessage.IOUTransactionID', 0)}`,
+    },
+})(MoneyRequestHeader);
diff --git a/src/components/MultipleAvatars.js b/src/components/MultipleAvatars.js
index 4c6ba1307fb7..1cdacb5fc1cc 100644
--- a/src/components/MultipleAvatars.js
+++ b/src/components/MultipleAvatars.js
@@ -25,7 +25,7 @@ const propTypes = {
     secondAvatarStyle: PropTypes.arrayOf(PropTypes.object),
 
     /** A fallback avatar icon to display when there is an error on loading avatar from remote URL. */
-    fallbackIcon: PropTypes.func,
+    fallbackIcon: PropTypes.oneOfType([PropTypes.func, PropTypes.string]),
 
     /** Prop to identify if we should load avatars vertically instead of diagonally */
     shouldStackHorizontally: PropTypes.bool,
@@ -134,6 +134,7 @@ function MultipleAvatars(props) {
                         fill={themeColors.iconSuccessFill}
                         name={props.icons[0].name}
                         type={props.icons[0].type}
+                        fallbackIcon={props.icons[0].fallbackIcon}
                     />
                 </View>
             </UserDetailsTooltip>
@@ -184,6 +185,7 @@ function MultipleAvatars(props) {
                                         size={props.size}
                                         name={icon.name}
                                         type={icon.type}
+                                        fallbackIcon={icon.fallbackIcon}
                                     />
                                 </View>
                             </UserDetailsTooltip>
@@ -221,6 +223,7 @@ function MultipleAvatars(props) {
                                         <Text
                                             selectable={false}
                                             style={[styles.avatarInnerTextSmall, StyleUtils.getAvatarExtraFontSizeStyle(props.size)]}
+                                            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                                         >{`+${avatars.length - props.maxAvatarsInRow}`}</Text>
                                     </View>
                                 </View>
@@ -248,6 +251,7 @@ function MultipleAvatars(props) {
                                     imageStyles={[singleAvatarStyle]}
                                     name={props.icons[0].name}
                                     type={props.icons[0].type}
+                                    fallbackIcon={props.icons[0].fallbackIcon}
                                 />
                             </View>
                         </UserDetailsTooltip>
@@ -269,6 +273,7 @@ function MultipleAvatars(props) {
                                             imageStyles={[singleAvatarStyle]}
                                             name={props.icons[1].name}
                                             type={props.icons[1].type}
+                                            fallbackIcon={props.icons[1].fallbackIcon}
                                         />
                                     </View>
                                 </UserDetailsTooltip>
@@ -278,6 +283,7 @@ function MultipleAvatars(props) {
                                         <Text
                                             selectable={false}
                                             style={props.size === CONST.AVATAR_SIZE.SMALL ? styles.avatarInnerTextSmall : styles.avatarInnerText}
+                                            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                                         >
                                             {`+${props.icons.length - 1}`}
                                         </Text>
diff --git a/src/components/NewDatePicker/CalendarPicker/YearPickerModal.js b/src/components/NewDatePicker/CalendarPicker/YearPickerModal.js
index 1149f9dc56ce..9825109fbb63 100644
--- a/src/components/NewDatePicker/CalendarPicker/YearPickerModal.js
+++ b/src/components/NewDatePicker/CalendarPicker/YearPickerModal.js
@@ -64,6 +64,7 @@ function YearPickerModal(props) {
                 style={[styles.pb0]}
                 includePaddingTop={false}
                 includeSafeAreaPaddingBottom={false}
+                testID={YearPickerModal.displayName}
             >
                 <HeaderWithBackButton
                     title={translate('yearPickerPage.year')}
diff --git a/src/components/NewDatePicker/CalendarPicker/index.js b/src/components/NewDatePicker/CalendarPicker/index.js
index fe0c36d32e41..1e1ef3c3fad3 100644
--- a/src/components/NewDatePicker/CalendarPicker/index.js
+++ b/src/components/NewDatePicker/CalendarPicker/index.js
@@ -130,7 +130,10 @@ class CalendarPicker extends React.PureComponent {
 
         return (
             <View>
-                <View style={[styles.calendarHeader, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.ph4, styles.pr1]}>
+                <View
+                    style={[styles.calendarHeader, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.ph4, styles.pr1]}
+                    dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                >
                     <PressableWithFeedback
                         onPress={() => this.setState({isYearPickerVisible: true})}
                         style={[styles.alignItemsCenter, styles.flexRow, styles.flex1, styles.justifyContentStart]}
@@ -186,6 +189,7 @@ class CalendarPicker extends React.PureComponent {
                         <View
                             key={dayOfWeek}
                             style={[styles.calendarDayRoot, styles.flex1, styles.justifyContentCenter, styles.alignItemsCenter]}
+                            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                         >
                             <Text style={styles.sidebarLinkTextBold}>{dayOfWeek[0]}</Text>
                         </View>
@@ -212,6 +216,7 @@ class CalendarPicker extends React.PureComponent {
                                     accessibilityLabel={day ? day.toString() : undefined}
                                     focusable={Boolean(day)}
                                     accessible={Boolean(day)}
+                                    dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                                 >
                                     {({hovered, pressed}) => (
                                         <View
diff --git a/src/components/OfflineWithFeedback.js b/src/components/OfflineWithFeedback.js
index fb0411d24f4c..dae170dd1d5c 100644
--- a/src/components/OfflineWithFeedback.js
+++ b/src/components/OfflineWithFeedback.js
@@ -2,11 +2,7 @@ import _ from 'underscore';
 import React from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
-import compose from '../libs/compose';
-import withLocalize, {withLocalizePropTypes} from './withLocalize';
-import {withNetwork} from './OnyxProvider';
 import CONST from '../CONST';
-import networkPropTypes from './networkPropTypes';
 import stylePropTypes from '../styles/stylePropTypes';
 import styles from '../styles/styles';
 import Tooltip from './Tooltip';
@@ -16,6 +12,8 @@ import * as StyleUtils from '../styles/StyleUtils';
 import DotIndicatorMessage from './DotIndicatorMessage';
 import shouldRenderOffscreen from '../libs/shouldRenderOffscreen';
 import PressableWithoutFeedback from './Pressable/PressableWithoutFeedback';
+import useLocalize from '../hooks/useLocalize';
+import useNetwork from '../hooks/useNetwork';
 
 /**
  * This component should be used when we are using the offline pattern B (offline with feedback).
@@ -46,9 +44,6 @@ const propTypes = {
     /** The content that needs offline feedback */
     children: PropTypes.node.isRequired,
 
-    /** Information about the network */
-    network: networkPropTypes.isRequired,
-
     /** Additional styles to add after local styles. Applied to the parent container */
     style: stylePropTypes,
 
@@ -58,7 +53,11 @@ const propTypes = {
     /** Additional style object for the error row */
     errorRowStyles: stylePropTypes,
 
-    ...withLocalizePropTypes,
+    /** Whether applying strikethrough to the children should be disabled */
+    shouldDisableStrikeThrough: PropTypes.bool,
+
+    /** Whether to apply needsOffscreenAlphaCompositing prop to the children */
+    needsOffscreenAlphaCompositing: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -71,6 +70,8 @@ const defaultProps = {
     style: [],
     contentContainerStyle: [],
     errorRowStyles: [],
+    shouldDisableStrikeThrough: false,
+    needsOffscreenAlphaCompositing: false,
 };
 
 /**
@@ -92,17 +93,20 @@ function applyStrikeThrough(children) {
 }
 
 function OfflineWithFeedback(props) {
+    const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
+
     const hasErrors = !_.isEmpty(props.errors);
 
     // Some errors have a null message. This is used to apply opacity only and to avoid showing redundant messages.
     const errorMessages = _.omit(props.errors, (e) => e === null);
     const hasErrorMessages = !_.isEmpty(errorMessages);
-    const isOfflinePendingAction = props.network.isOffline && props.pendingAction;
+    const isOfflinePendingAction = isOffline && props.pendingAction;
     const isUpdateOrDeleteError = hasErrors && (props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
     const isAddError = hasErrors && props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
     const needsOpacity = !props.shouldDisableOpacity && ((isOfflinePendingAction && !isUpdateOrDeleteError) || isAddError);
-    const needsStrikeThrough = props.network.isOffline && props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-    const hideChildren = props.shouldHideOnDelete && !props.network.isOffline && props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && !hasErrors;
+    const needsStrikeThrough = !props.shouldDisableStrikeThrough && isOffline && props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+    const hideChildren = props.shouldHideOnDelete && !isOffline && props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && !hasErrors;
     let children = props.children;
 
     // Apply strikethrough to children if needed, but skip it if we are not going to render them
@@ -126,12 +130,12 @@ function OfflineWithFeedback(props) {
                         messages={errorMessages}
                         type="error"
                     />
-                    <Tooltip text={props.translate('common.close')}>
+                    <Tooltip text={translate('common.close')}>
                         <PressableWithoutFeedback
                             onPress={props.onClose}
                             style={[styles.touchableButtonImage]}
                             accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
-                            accessibilityLabel={props.translate('common.close')}
+                            accessibilityLabel={translate('common.close')}
                         >
                             <Icon src={Expensicons.Close} />
                         </PressableWithoutFeedback>
@@ -146,4 +150,4 @@ OfflineWithFeedback.propTypes = propTypes;
 OfflineWithFeedback.defaultProps = defaultProps;
 OfflineWithFeedback.displayName = 'OfflineWithFeedback';
 
-export default compose(withLocalize, withNetwork())(OfflineWithFeedback);
+export default OfflineWithFeedback;
diff --git a/src/components/Onfido/index.css b/src/components/Onfido/index.css
index 7e05cce7d49d..5c76f42037a5 100644
--- a/src/components/Onfido/index.css
+++ b/src/components/Onfido/index.css
@@ -46,4 +46,11 @@
          spacing makes room for the header without cutting off the bottom of the Onfido window. */
         height: 92% !important;
     }
-}
+
+    /* 
+    * Solves issue with height not working for `onfido-sdk-ui-Modal-inner` container when device width is in between 490 - 600pixels.
+    */
+    #onfido-mount {
+        height: 100%;
+    }
+}
\ No newline at end of file
diff --git a/src/components/OpacityView.js b/src/components/OpacityView.js
index 2d09da744267..daef93cdc09b 100644
--- a/src/components/OpacityView.js
+++ b/src/components/OpacityView.js
@@ -3,6 +3,7 @@ import Animated, {useAnimatedStyle, useSharedValue, withTiming} from 'react-nati
 import PropTypes from 'prop-types';
 import variables from '../styles/variables';
 import * as StyleUtils from '../styles/StyleUtils';
+import shouldRenderOffscreen from '../libs/shouldRenderOffscreen';
 
 const propTypes = {
     /**
@@ -27,11 +28,15 @@ const propTypes = {
      * @default 0.5
      */
     dimmingValue: PropTypes.number,
+
+    /** Whether the view needs to be rendered offscreen (for Android only) */
+    needsOffscreenAlphaCompositing: PropTypes.bool,
 };
 
 const defaultProps = {
     style: [],
     dimmingValue: variables.hoverDimValue,
+    needsOffscreenAlphaCompositing: false,
 };
 
 function OpacityView(props) {
@@ -48,7 +53,14 @@ function OpacityView(props) {
         }
     }, [props.shouldDim, props.dimmingValue, opacity]);
 
-    return <Animated.View style={[opacityStyle, ...StyleUtils.parseStyleAsArray(props.style)]}>{props.children}</Animated.View>;
+    return (
+        <Animated.View
+            style={[opacityStyle, ...StyleUtils.parseStyleAsArray(props.style)]}
+            needsOffscreenAlphaCompositing={shouldRenderOffscreen ? props.needsOffscreenAlphaCompositing : undefined}
+        >
+            {props.children}
+        </Animated.View>
+    );
 }
 
 OpacityView.displayName = 'OpacityView';
diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js
index adaa4457bbd9..70415ab03a13 100644
--- a/src/components/OptionRow.js
+++ b/src/components/OptionRow.js
@@ -8,6 +8,7 @@ import * as StyleUtils from '../styles/StyleUtils';
 import optionPropTypes from './optionPropTypes';
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
+import Button from './Button';
 import MultipleAvatars from './MultipleAvatars';
 import Hoverable from './Hoverable';
 import DisplayNames from './DisplayNames';
@@ -39,6 +40,18 @@ const propTypes = {
     /** Whether we should show the selected state */
     showSelectedState: PropTypes.bool,
 
+    /** Whether to show a button pill instead of a tickbox */
+    shouldShowSelectedStateAsButton: PropTypes.bool,
+
+    /** Text for button pill */
+    selectedStateButtonText: PropTypes.string,
+
+    /** Callback to fire when the multiple selector (tickbox or button) is clicked */
+    onSelectedStatePressed: PropTypes.func,
+
+    /** Whether we highlight selected option */
+    highlightSelected: PropTypes.bool,
+
     /** Whether this item is selected */
     isSelected: PropTypes.bool,
 
@@ -57,6 +70,9 @@ const propTypes = {
     /** Whether to remove the lateral padding and align the content with the margins */
     shouldDisableRowInnerPadding: PropTypes.bool,
 
+    /** Whether to wrap large text up to 2 lines */
+    isMultilineSupported: PropTypes.bool,
+
     style: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
 
     ...withLocalizePropTypes,
@@ -65,12 +81,17 @@ const propTypes = {
 const defaultProps = {
     hoverStyle: styles.sidebarLinkHover,
     showSelectedState: false,
+    shouldShowSelectedStateAsButton: false,
+    selectedStateButtonText: 'Select',
+    onSelectedStatePressed: () => {},
+    highlightSelected: false,
     isSelected: false,
     boldStyle: false,
     showTitleTooltip: false,
     onSelectRow: undefined,
     isDisabled: false,
     optionIsFocused: false,
+    isMultilineSupported: false,
     style: null,
     shouldHaveOptionSeparator: false,
     shouldDisableRowInnerPadding: false,
@@ -89,9 +110,12 @@ class OptionRow extends Component {
         return (
             this.state.isDisabled !== nextState.isDisabled ||
             this.props.isDisabled !== nextProps.isDisabled ||
+            this.props.isMultilineSupported !== nextProps.isMultilineSupported ||
             this.props.isSelected !== nextProps.isSelected ||
             this.props.shouldHaveOptionSeparator !== nextProps.shouldHaveOptionSeparator ||
+            this.props.selectedStateButtonText !== nextProps.selectedStateButtonText ||
             this.props.showSelectedState !== nextProps.showSelectedState ||
+            this.props.highlightSelected !== nextProps.highlightSelected ||
             this.props.showTitleTooltip !== nextProps.showTitleTooltip ||
             !_.isEqual(this.props.option.icons, nextProps.option.icons) ||
             this.props.optionIsFocused !== nextProps.optionIsFocused ||
@@ -119,7 +143,7 @@ class OptionRow extends Component {
         let pressableRef = null;
         const textStyle = this.props.optionIsFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText;
         const textUnreadStyle = this.props.boldStyle || this.props.option.boldStyle ? [textStyle, styles.sidebarLinkTextBold] : [textStyle];
-        const displayNameStyle = StyleUtils.combineStyles(styles.optionDisplayName, textUnreadStyle, this.props.style, styles.pre);
+        const displayNameStyle = StyleUtils.combineStyles(styles.optionDisplayName, textUnreadStyle, this.props.style, styles.pre, this.state.isDisabled ? styles.optionRowDisabled : {});
         const alternateTextStyle = StyleUtils.combineStyles(
             textStyle,
             styles.optionAlternateText,
@@ -182,11 +206,13 @@ 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}
                             hoverDimmingValue={1}
                             hoverStyle={this.props.hoverStyle}
+                            needsOffscreenAlphaCompositing={lodashGet(this.props.option, 'icons.length', 0) >= 2}
                         >
                             <View style={sidebarInnerRowStyle}>
                                 <View style={[styles.flexRow, styles.alignItemsCenter]}>
@@ -195,18 +221,14 @@ class OptionRow extends Component {
                                             <SubscriptAvatar
                                                 mainAvatar={this.props.option.icons[0]}
                                                 secondaryAvatar={this.props.option.icons[1]}
-                                                backgroundColor={hovered && !this.props.optionIsFocused ? hoveredBackgroundColor : subscriptColor}
+                                                backgroundColor={hovered ? hoveredBackgroundColor : subscriptColor}
                                                 size={defaultSubscriptSize}
                                             />
                                         ) : (
                                             <MultipleAvatars
                                                 icons={this.props.option.icons}
                                                 size={CONST.AVATAR_SIZE.DEFAULT}
-                                                secondAvatarStyle={[
-                                                    StyleUtils.getBackgroundAndBorderStyle(themeColors.appBG),
-                                                    this.props.optionIsFocused ? StyleUtils.getBackgroundAndBorderStyle(focusedBackgroundColor) : undefined,
-                                                    hovered && !this.props.optionIsFocused ? StyleUtils.getBackgroundAndBorderStyle(hoveredBackgroundColor) : undefined,
-                                                ]}
+                                                secondAvatarStyle={[StyleUtils.getBackgroundAndBorderStyle(hovered ? hoveredBackgroundColor : subscriptColor)]}
                                                 shouldShowTooltip={this.props.showTitleTooltip && OptionsListUtils.shouldOptionShowTooltip(this.props.option)}
                                             />
                                         ))}
@@ -216,7 +238,7 @@ class OptionRow extends Component {
                                             fullTitle={this.props.option.text}
                                             displayNamesWithTooltips={displayNamesWithTooltips}
                                             tooltipEnabled={this.props.showTitleTooltip}
-                                            numberOfLines={1}
+                                            numberOfLines={this.props.isMultilineSupported ? 2 : 1}
                                             textStyles={displayNameStyle}
                                             shouldUseFullTitle={
                                                 this.props.option.isChatRoom ||
@@ -248,7 +270,34 @@ class OptionRow extends Component {
                                             />
                                         </View>
                                     )}
-                                    {this.props.showSelectedState && <SelectCircle isChecked={this.props.isSelected} />}
+                                    {this.props.showSelectedState && (
+                                        <>
+                                            {this.props.shouldShowSelectedStateAsButton && !this.props.isSelected ? (
+                                                <Button
+                                                    style={[styles.pl2]}
+                                                    text={this.props.selectedStateButtonText}
+                                                    onPress={() => this.props.onSelectedStatePressed(this.props.option)}
+                                                    small
+                                                />
+                                            ) : (
+                                                <PressableWithFeedback
+                                                    onPress={() => this.props.onSelectedStatePressed(this.props.option)}
+                                                    accessibilityRole={CONST.ACCESSIBILITY_ROLE.CHECKBOX}
+                                                    accessibilityLabel={CONST.ACCESSIBILITY_ROLE.CHECKBOX}
+                                                >
+                                                    <SelectCircle isChecked={this.props.isSelected} />
+                                                </PressableWithFeedback>
+                                            )}
+                                        </>
+                                    )}
+                                    {this.props.isSelected && this.props.highlightSelected && (
+                                        <View style={styles.defaultCheckmarkWrapper}>
+                                            <Icon
+                                                src={Expensicons.Checkmark}
+                                                fill={themeColors.iconSuccessFill}
+                                            />
+                                        </View>
+                                    )}
                                 </View>
                             </View>
                             {Boolean(this.props.option.customIcon) && (
diff --git a/src/components/OptionsList/BaseOptionsList.js b/src/components/OptionsList/BaseOptionsList.js
index 8f63cfc29959..5a40c28a86c9 100644
--- a/src/components/OptionsList/BaseOptionsList.js
+++ b/src/components/OptionsList/BaseOptionsList.js
@@ -56,10 +56,15 @@ function BaseOptionsList({
     shouldDisableRowInnerPadding,
     disableFocusOptions,
     canSelectMultipleOptions,
+    shouldShowMultipleOptionSelectorAsButton,
+    multipleOptionSelectorButtonText,
+    onAddToSelection,
+    highlightSelectedOptions,
     onSelectRow,
     boldStyle,
     isDisabled,
     innerRef,
+    isRowMultilineSupported,
 }) {
     const flattenedData = useRef();
     const previousSections = usePrevious(sections);
@@ -168,6 +173,22 @@ function BaseOptionsList({
      */
     const renderItem = ({item, index, section}) => {
         const isItemDisabled = isDisabled || section.isDisabled || !!item.isDisabled;
+        const isSelected = _.some(selectedOptions, (option) => {
+            if (option.accountID && option.accountID === item.accountID) {
+                return true;
+            }
+
+            if (option.reportID && option.reportID === item.reportID) {
+                return true;
+            }
+
+            if (_.isEmpty(option.name)) {
+                return false;
+            }
+
+            return option.name === item.searchText;
+        });
+
         return (
             <OptionRow
                 option={item}
@@ -175,12 +196,17 @@ function BaseOptionsList({
                 hoverStyle={optionHoveredStyle}
                 optionIsFocused={!disableFocusOptions && !isItemDisabled && focusedIndex === index + section.indexOffset}
                 onSelectRow={onSelectRow}
-                isSelected={Boolean(_.find(selectedOptions, (option) => option.accountID === item.accountID))}
+                isSelected={isSelected}
                 showSelectedState={canSelectMultipleOptions}
+                shouldShowSelectedStateAsButton={shouldShowMultipleOptionSelectorAsButton}
+                selectedStateButtonText={multipleOptionSelectorButtonText}
+                onSelectedStatePressed={onAddToSelection}
+                highlightSelected={highlightSelectedOptions}
                 boldStyle={boldStyle}
                 isDisabled={isItemDisabled}
                 shouldHaveOptionSeparator={index > 0 && shouldHaveOptionSeparator}
                 shouldDisableRowInnerPadding={shouldDisableRowInnerPadding}
+                isMultilineSupported={isRowMultilineSupported}
             />
         );
     };
@@ -214,7 +240,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 4e4a519ac621..aa02701b1c98 100755
--- a/src/components/OptionsSelector/BaseOptionsSelector.js
+++ b/src/components/OptionsSelector/BaseOptionsSelector.js
@@ -2,7 +2,7 @@ import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import React, {Component} from 'react';
 import PropTypes from 'prop-types';
-import {View, InteractionManager} from 'react-native';
+import {View} from 'react-native';
 import Button from '../Button';
 import FixedFooter from '../FixedFooter';
 import OptionsList from '../OptionsList';
@@ -16,11 +16,9 @@ import KeyboardShortcut from '../../libs/KeyboardShortcut';
 import {propTypes as optionsSelectorPropTypes, defaultProps as optionsSelectorDefaultProps} from './optionsSelectorPropTypes';
 import setSelection from '../../libs/setSelection';
 import compose from '../../libs/compose';
+import getPlatform from '../../libs/getPlatform';
 
 const propTypes = {
-    /** Whether we should wait before focusing the TextInput, useful when using transitions on Android */
-    shouldDelayFocus: PropTypes.bool,
-
     /** padding bottom style of safe area */
     safeAreaPaddingBottomStyle: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
 
@@ -70,6 +68,12 @@ class BaseOptionsSelector extends Component {
     componentDidMount() {
         this.subscribeToKeyboardShortcut();
 
+        if (this.props.isFocused && this.props.autoFocus && this.textInput) {
+            setTimeout(() => {
+                this.textInput.focus();
+            }, CONST.ANIMATED_TRANSITION);
+        }
+
         this.scrollToIndex(this.props.selectedOptions.length ? 0 : this.state.focusedIndex, false);
     }
 
@@ -82,12 +86,13 @@ class BaseOptionsSelector extends Component {
             }
         }
 
-        if (this.textInput && this.props.autoFocus && !prevProps.isFocused && this.props.isFocused) {
-            InteractionManager.runAfterInteractions(() => {
-                // If we automatically focus on a text input when mounting a component,
-                // let's automatically focus on it when the component updates as well (eg, when navigating back from a page)
+        // Screen coming back into focus, for example
+        // when doing Cmd+Shift+K, then Cmd+K, then Cmd+Shift+K.
+        // Only applies to platforms that support keyboard shortcuts
+        if ([CONST.PLATFORM.DESKTOP, CONST.PLATFORM.WEB].includes(getPlatform()) && !prevProps.isFocused && this.props.isFocused && this.props.autoFocus && this.textInput) {
+            setTimeout(() => {
                 this.textInput.focus();
-            });
+            }, CONST.ANIMATED_TRANSITION);
         }
 
         if (_.isEqual(this.props.sections, prevProps.sections)) {
@@ -102,13 +107,13 @@ class BaseOptionsSelector extends Component {
             });
             return;
         }
-        const newFocusedIndex = this.props.selectedOptions.length;
 
+        const newFocusedIndex = this.props.selectedOptions.length;
         // eslint-disable-next-line react/no-did-update-set-state
         this.setState(
             {
                 allOptions: newOptions,
-                focusedIndex: newFocusedIndex,
+                focusedIndex: _.isNumber(this.props.initialFocusedIndex) ? this.props.initialFocusedIndex : newFocusedIndex,
             },
             () => {
                 // If we just toggled an option on a multi-selection page or cleared the search input, scroll to top
@@ -139,6 +144,10 @@ class BaseOptionsSelector extends Component {
      * @returns {Number}
      */
     getInitiallyFocusedIndex(allOptions) {
+        if (_.isNumber(this.props.initialFocusedIndex)) {
+            return this.props.initialFocusedIndex;
+        }
+
         if (this.props.selectedOptions.length > 0) {
             return this.props.selectedOptions.length;
         }
@@ -224,6 +233,14 @@ class BaseOptionsSelector extends Component {
         }
     }
 
+    focus() {
+        if (!this.textInput) {
+            return;
+        }
+
+        this.textInput.focus();
+    }
+
     /**
      * Flattens the sections into a single array of options.
      * Each object in this array is enhanced to have:
@@ -347,8 +364,6 @@ class BaseOptionsSelector extends Component {
                 selectTextOnFocus
                 blurOnSubmit={Boolean(this.state.allOptions.length)}
                 spellCheck={false}
-                autoFocus={this.props.autoFocus}
-                shouldDelayFocus={this.props.shouldDelayFocus}
             />
         );
         const optionsList = (
@@ -360,12 +375,16 @@ class BaseOptionsSelector extends Component {
                 focusedIndex={this.state.focusedIndex}
                 selectedOptions={this.props.selectedOptions}
                 canSelectMultipleOptions={this.props.canSelectMultipleOptions}
+                shouldShowMultipleOptionSelectorAsButton={this.props.shouldShowMultipleOptionSelectorAsButton}
+                multipleOptionSelectorButtonText={this.props.multipleOptionSelectorButtonText}
+                onAddToSelection={this.props.onAddToSelection}
                 hideSectionHeaders={this.props.hideSectionHeaders}
                 headerMessage={this.props.headerMessage}
                 boldStyle={this.props.boldStyle}
                 showTitleTooltip={this.props.showTitleTooltip}
                 isDisabled={this.props.isDisabled}
                 shouldHaveOptionSeparator={this.props.shouldHaveOptionSeparator}
+                highlightSelectedOptions={this.props.highlightSelectedOptions}
                 onLayout={() => {
                     if (this.props.selectedOptions.length === 0) {
                         this.scrollToIndex(this.state.focusedIndex, false);
@@ -380,6 +399,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..ca336c324673 100644
--- a/src/components/OptionsSelector/optionsSelectorPropTypes.js
+++ b/src/components/OptionsSelector/optionsSelectorPropTypes.js
@@ -53,6 +53,18 @@ const propTypes = {
     /** Whether we can select multiple options */
     canSelectMultipleOptions: PropTypes.bool,
 
+    /** Whether to show a button pill instead of a standard tickbox */
+    shouldShowMultipleOptionSelectorAsButton: PropTypes.bool,
+
+    /** Text for button pill */
+    multipleOptionSelectorButtonText: PropTypes.string,
+
+    /** Callback to fire when the multiple selector (tickbox or button) is clicked */
+    onAddToSelection: PropTypes.func,
+
+    /** Whether we highlight selected options */
+    highlightSelectedOptions: PropTypes.bool,
+
     /** Whether any section headers should be visible */
     hideSectionHeaders: PropTypes.bool,
 
@@ -106,6 +118,12 @@ const propTypes = {
 
     /** Whether to use default padding and flex styles for children */
     shouldUseStyleForChildren: PropTypes.bool,
+
+    /** Whether to wrap large text up to 2 lines */
+    isRowMultilineSupported: PropTypes.bool,
+
+    /** Initial focused index value */
+    initialFocusedIndex: PropTypes.number,
 };
 
 const defaultProps = {
@@ -116,6 +134,10 @@ const defaultProps = {
     selectedOptions: [],
     headerMessage: '',
     canSelectMultipleOptions: false,
+    shouldShowMultipleOptionSelectorAsButton: false,
+    multipleOptionSelectorButtonText: '',
+    onAddToSelection: () => {},
+    highlightSelectedOptions: false,
     hideSectionHeaders: false,
     boldStyle: false,
     showTitleTooltip: false,
@@ -136,6 +158,8 @@ const defaultProps = {
     shouldShowTextInput: true,
     onChangeText: () => {},
     shouldUseStyleForChildren: true,
+    isRowMultilineSupported: false,
+    initialFocusedIndex: undefined,
 };
 
 export {propTypes, defaultProps};
diff --git a/src/components/PDFView/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/ParentNavigationSubtitle.js b/src/components/ParentNavigationSubtitle.js
index fd388b00a8a7..037489294073 100644
--- a/src/components/ParentNavigationSubtitle.js
+++ b/src/components/ParentNavigationSubtitle.js
@@ -38,7 +38,7 @@ function ParentNavigationSubtitle(props) {
     return (
         <PressableWithoutFeedback
             onPress={() => {
-                Navigation.navigate(ROUTES.getReportRoute(props.parentReportID));
+                Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(props.parentReportID));
             }}
             accessibilityLabel={translate('threads.parentNavigationSummary', {rootReportName, workspaceName})}
             accessibilityRole={CONST.ACCESSIBILITY_ROLE.LINK}
diff --git a/src/components/Picker/BasePicker.js b/src/components/Picker/BasePicker.js
index 550b8a386aa1..697dfc509d22 100644
--- a/src/components/Picker/BasePicker.js
+++ b/src/components/Picker/BasePicker.js
@@ -258,6 +258,7 @@ function BasePicker(props) {
                     }}
                     pickerProps={{
                         ref: picker,
+                        tabIndex: -1,
                         onFocus: enableHighlight,
                         onBlur: () => {
                             disableHighlight();
diff --git a/src/components/PlaidLink/index.native.js b/src/components/PlaidLink/index.native.js
index cd17453820cf..48cd41e283c3 100644
--- a/src/components/PlaidLink/index.native.js
+++ b/src/components/PlaidLink/index.native.js
@@ -1,16 +1,13 @@
 import {useEffect} from 'react';
 import {openLink, useDeepLinkRedirector, usePlaidEmitter} from 'react-native-plaid-link-sdk';
 import Log from '../../libs/Log';
-import CONST from '../../CONST';
 import {plaidLinkPropTypes, plaidLinkDefaultProps} from './plaidLinkPropTypes';
 
 function PlaidLink(props) {
     useDeepLinkRedirector();
     usePlaidEmitter((event) => {
         Log.info('[PlaidLink] Handled Plaid Event: ', false, event);
-        if (event.eventName === CONST.PLAID.EVENT.ERROR) {
-            props.onError(event.metadata);
-        }
+        props.onEvent(event.eventName, event.metadata);
     });
     useEffect(() => {
         openLink({
@@ -20,9 +17,6 @@ function PlaidLink(props) {
             onSuccess: ({publicToken, metadata}) => {
                 props.onSuccess({publicToken, metadata});
             },
-            onEvent: (event, metadata) => {
-                props.onEvent(event, metadata);
-            },
             onExit: (exitError, metadata) => {
                 Log.info('[PlaidLink] Exit: ', false, {exitError, metadata});
                 props.onExit();
diff --git a/src/components/Popover/index.js b/src/components/Popover/index.js
index bfd02ba1d3e3..a886fbbd0c6b 100644
--- a/src/components/Popover/index.js
+++ b/src/components/Popover/index.js
@@ -11,23 +11,41 @@ import PopoverWithoutOverlay from '../PopoverWithoutOverlay';
  * On small screen widths, it uses BottomDocked modal type, and a Popover type on wide screen widths.
  */
 function Popover(props) {
-    if (!props.fullscreen && !props.isSmallScreenWidth) {
+    const {isVisible, onClose, isSmallScreenWidth, fullscreen, animationInTiming, onLayout, animationOutTiming, disableAnimation, withoutOverlay, anchorPosition} = props;
+
+    // Not adding this inside the PopoverProvider
+    // because this is an issue on smaller screens as well.
+    React.useEffect(() => {
+        const listener = () => {
+            if (!isVisible) {
+                return;
+            }
+
+            onClose();
+        };
+        window.addEventListener('popstate', listener);
+        return () => {
+            window.removeEventListener('popstate', listener);
+        };
+    }, [onClose, isVisible]);
+
+    if (!fullscreen && !isSmallScreenWidth) {
         return createPortal(
             <Modal
                 // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 type={CONST.MODAL.MODAL_TYPE.POPOVER}
-                popoverAnchorPosition={props.anchorPosition}
-                animationInTiming={props.disableAnimation ? 1 : props.animationInTiming}
-                animationOutTiming={props.disableAnimation ? 1 : props.animationOutTiming}
+                popoverAnchorPosition={anchorPosition}
+                animationInTiming={disableAnimation ? 1 : animationInTiming}
+                animationOutTiming={disableAnimation ? 1 : animationOutTiming}
                 shouldCloseOnOutsideClick
-                onLayout={props.onLayout}
+                onLayout={onLayout}
             />,
             document.body,
         );
     }
 
-    if (props.withoutOverlay && !props.isSmallScreenWidth) {
+    if (withoutOverlay && !isSmallScreenWidth) {
         // eslint-disable-next-line react/jsx-props-no-spreading
         return createPortal(<PopoverWithoutOverlay {...props} />, document.body);
     }
@@ -36,12 +54,12 @@ function Popover(props) {
         <Modal
             // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
-            type={props.isSmallScreenWidth ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.POPOVER}
-            popoverAnchorPosition={props.isSmallScreenWidth ? undefined : props.anchorPosition}
-            fullscreen={props.isSmallScreenWidth ? true : props.fullscreen}
-            animationInTiming={props.disableAnimation && !props.isSmallScreenWidth ? 1 : props.animationInTiming}
-            animationOutTiming={props.disableAnimation && !props.isSmallScreenWidth ? 1 : props.animationOutTiming}
-            onLayout={props.onLayout}
+            type={isSmallScreenWidth ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.POPOVER}
+            popoverAnchorPosition={isSmallScreenWidth ? undefined : anchorPosition}
+            fullscreen={isSmallScreenWidth ? true : fullscreen}
+            animationInTiming={disableAnimation && !isSmallScreenWidth ? 1 : animationInTiming}
+            animationOutTiming={disableAnimation && !isSmallScreenWidth ? 1 : animationOutTiming}
+            onLayout={onLayout}
         />
     );
 }
diff --git a/src/components/PopoverMenu/index.js b/src/components/PopoverMenu/index.js
index 5fabf73547ea..840e777b2479 100644
--- a/src/components/PopoverMenu/index.js
+++ b/src/components/PopoverMenu/index.js
@@ -34,6 +34,9 @@ const propTypes = {
     }),
 
     withoutOverlay: PropTypes.bool,
+
+    /** Function to call on modal hide */
+    onModalHide: PropTypes.func,
 };
 
 const defaultProps = {
@@ -44,6 +47,7 @@ const defaultProps = {
     },
     anchorRef: () => {},
     withoutOverlay: false,
+    onModalHide: () => {},
 };
 
 function PopoverMenu(props) {
@@ -78,6 +82,7 @@ function PopoverMenu(props) {
             isVisible={props.isVisible}
             onModalHide={() => {
                 setFocusedIndex(-1);
+                props.onModalHide();
                 if (selectedItemIndex.current !== null) {
                     props.menuItems[selectedItemIndex.current].onSelected();
                     selectedItemIndex.current = null;
@@ -98,6 +103,7 @@ function PopoverMenu(props) {
                         icon={item.icon}
                         iconWidth={item.iconWidth}
                         iconHeight={item.iconHeight}
+                        iconFill={item.iconFill}
                         title={item.text}
                         description={item.description}
                         onPress={() => selectItem(menuIndex)}
diff --git a/src/components/PopoverWithMeasuredContent.js b/src/components/PopoverWithMeasuredContent.js
index 492807274d1e..6b71b4a59055 100644
--- a/src/components/PopoverWithMeasuredContent.js
+++ b/src/components/PopoverWithMeasuredContent.js
@@ -149,7 +149,7 @@ function PopoverWithMeasuredContent(props) {
             but we can't measure its dimensions without first rendering it.
         */
         <View
-            style={styles.invisible}
+            style={styles.invisiblePopover}
             onLayout={measurePopover}
         >
             {props.children}
diff --git a/src/components/Pressable/GenericPressable/BaseGenericPressable.js b/src/components/Pressable/GenericPressable/BaseGenericPressable.js
index 0c5b75b1bb13..9bb221b2de1e 100644
--- a/src/components/Pressable/GenericPressable/BaseGenericPressable.js
+++ b/src/components/Pressable/GenericPressable/BaseGenericPressable.js
@@ -5,6 +5,7 @@ import _ from 'underscore';
 import Accessibility from '../../../libs/Accessibility';
 import HapticFeedback from '../../../libs/HapticFeedback';
 import KeyboardShortcut from '../../../libs/KeyboardShortcut';
+import * as Browser from '../../../libs/Browser';
 import styles from '../../../styles/styles';
 import genericPressablePropTypes from './PropTypes';
 import CONST from '../../../CONST';
@@ -127,13 +128,15 @@ const GenericPressable = forwardRef((props, ref) => {
         return KeyboardShortcut.subscribe(shortcutKey, onPressHandler, descriptionKey, modifiers, true, false, 0, false);
     }, [keyboardShortcut, onPressHandler]);
 
+    const defaultLongPressHandler = Browser.isMobileChrome() ? () => {} : undefined;
     return (
         <Pressable
             hitSlop={shouldUseAutoHitSlop ? hitSlop : undefined}
             onLayout={shouldUseAutoHitSlop ? onLayout : undefined}
             ref={ref}
             onPress={!isDisabled ? onPressHandler : undefined}
-            onLongPress={!isDisabled && onLongPress ? onLongPressHandler : undefined}
+            // In order to prevent haptic feedback, pass empty callback as onLongPress props. Please refer https://github.com/necolas/react-native-web/issues/2349#issuecomment-1195564240
+            onLongPress={!isDisabled && onLongPress ? onLongPressHandler : defaultLongPressHandler}
             onKeyPress={!isDisabled ? onKeyPressHandler : undefined}
             onKeyDown={!isDisabled ? onKeyDown : undefined}
             onPressIn={!isDisabled ? onPressIn : undefined}
diff --git a/src/components/Pressable/GenericPressable/index.js b/src/components/Pressable/GenericPressable/index.js
index 65fca85bc324..774ac3ac5092 100644
--- a/src/components/Pressable/GenericPressable/index.js
+++ b/src/components/Pressable/GenericPressable/index.js
@@ -15,7 +15,7 @@ const WebGenericPressable = forwardRef((props, ref) => (
         aria-labelledby={props.accessibilityLabelledBy}
         aria-valuenow={props.accessibilityValue}
         nativeID={props.nativeID}
-        dataSet={{tag: 'pressable', ...(props.noDragArea && {dragArea: false})}}
+        dataSet={{tag: 'pressable', ...(props.noDragArea && {dragArea: false}), ...props.dataSet}}
     />
 ));
 
diff --git a/src/components/Pressable/PressableWithFeedback.js b/src/components/Pressable/PressableWithFeedback.js
index 7eb0ee7286c9..a80e2109ebd7 100644
--- a/src/components/Pressable/PressableWithFeedback.js
+++ b/src/components/Pressable/PressableWithFeedback.js
@@ -7,7 +7,7 @@ import OpacityView from '../OpacityView';
 import variables from '../../styles/variables';
 import useSingleExecution from '../../hooks/useSingleExecution';
 
-const omittedProps = ['wrapperStyle'];
+const omittedProps = ['wrapperStyle', 'needsOffscreenAlphaCompositing'];
 
 const PressableWithFeedbackPropTypes = {
     ...GenericPressablePropTypes.pressablePropTypes,
@@ -27,6 +27,9 @@ const PressableWithFeedbackPropTypes = {
      *  Used to locate this view from native classes.
      */
     nativeID: propTypes.string,
+
+    /** Whether the view needs to be rendered offscreen (for Android only) */
+    needsOffscreenAlphaCompositing: propTypes.bool,
 };
 
 const PressableWithFeedbackDefaultProps = {
@@ -35,10 +38,11 @@ const PressableWithFeedbackDefaultProps = {
     hoverDimmingValue: variables.hoverDimValue,
     nativeID: '',
     wrapperStyle: [],
+    needsOffscreenAlphaCompositing: false,
 };
 
 const PressableWithFeedback = forwardRef((props, ref) => {
-    const propsWithoutWrapperStyles = _.omit(props, omittedProps);
+    const propsWithoutWrapperProps = _.omit(props, omittedProps);
     const {isExecuting, singleExecution} = useSingleExecution();
     const [isPressed, setIsPressed] = useState(false);
     const [isHovered, setIsHovered] = useState(false);
@@ -49,28 +53,37 @@ const PressableWithFeedback = forwardRef((props, ref) => {
             shouldDim={Boolean(!isDisabled && (isPressed || isHovered))}
             dimmingValue={isPressed ? props.pressDimmingValue : props.hoverDimmingValue}
             style={props.wrapperStyle}
+            needsOffscreenAlphaCompositing={props.needsOffscreenAlphaCompositing}
         >
             <GenericPressable
                 ref={ref}
                 // eslint-disable-next-line react/jsx-props-no-spreading
-                {...propsWithoutWrapperStyles}
+                {...propsWithoutWrapperProps}
                 disabled={isDisabled}
                 isExecuting={isExecuting}
                 onHoverIn={() => {
                     setIsHovered(true);
-                    if (props.onHoverIn) props.onHoverIn();
+                    if (props.onHoverIn) {
+                        props.onHoverIn();
+                    }
                 }}
                 onHoverOut={() => {
                     setIsHovered(false);
-                    if (props.onHoverOut) props.onHoverOut();
+                    if (props.onHoverOut) {
+                        props.onHoverOut();
+                    }
                 }}
                 onPressIn={() => {
                     setIsPressed(true);
-                    if (props.onPressIn) props.onPressIn();
+                    if (props.onPressIn) {
+                        props.onPressIn();
+                    }
                 }}
                 onPressOut={() => {
                     setIsPressed(false);
-                    if (props.onPressOut) props.onPressOut();
+                    if (props.onPressOut) {
+                        props.onPressOut();
+                    }
                 }}
                 onPress={(e) => {
                     singleExecution(() => props.onPress(e))();
diff --git a/src/components/PressableWithSecondaryInteraction/index.js b/src/components/PressableWithSecondaryInteraction/index.js
index 2771db6206ae..d84a3f282e97 100644
--- a/src/components/PressableWithSecondaryInteraction/index.js
+++ b/src/components/PressableWithSecondaryInteraction/index.js
@@ -1,103 +1,123 @@
 import _ from 'underscore';
-import React, {Component} from 'react';
-import * as pressableWithSecondaryInteractionPropTypes from './pressableWithSecondaryInteractionPropTypes';
+import React, {forwardRef, useEffect, useRef} from 'react';
 import styles from '../../styles/styles';
 import * as DeviceCapabilities from '../../libs/DeviceCapabilities';
 import * as StyleUtils from '../../styles/StyleUtils';
 import PressableWithFeedback from '../Pressable/PressableWithFeedback';
+import * as pressableWithSecondaryInteractionPropTypes from './pressableWithSecondaryInteractionPropTypes';
 
 /**
  * This is a special Pressable that calls onSecondaryInteraction when LongPressed, or right-clicked.
  */
-class PressableWithSecondaryInteraction extends Component {
-    constructor(props) {
-        super(props);
-        this.executeSecondaryInteraction = this.executeSecondaryInteraction.bind(this);
-        this.executeSecondaryInteractionOnContextMenu = this.executeSecondaryInteractionOnContextMenu.bind(this);
-    }
-
-    componentDidMount() {
-        if (this.props.forwardedRef) {
-            if (_.isFunction(this.props.forwardedRef)) {
-                this.props.forwardedRef(this.pressableRef);
-            } else if (_.isObject(this.props.forwardedRef)) {
-                this.props.forwardedRef.current = this.pressableRef;
-            }
-        }
-        this.pressableRef.addEventListener('contextmenu', this.executeSecondaryInteractionOnContextMenu);
-    }
 
-    componentWillUnmount() {
-        this.pressableRef.removeEventListener('contextmenu', this.executeSecondaryInteractionOnContextMenu);
-    }
+function PressableWithSecondaryInteraction({
+    children,
+    inline,
+    style,
+    enableLongPressWithHover,
+    withoutFocusOnSecondaryInteraction,
+    preventDefaultContextMenu,
+    onSecondaryInteraction,
+    onPressIn,
+    onPress,
+    onPressOut,
+    activeOpacity,
+    forwardedRef,
+    ...rest
+}) {
+    const pressableRef = useRef(null);
 
     /**
      * @param {Event} e - the secondary interaction event
      */
-    executeSecondaryInteraction(e) {
-        if (DeviceCapabilities.hasHoverSupport() && !this.props.enableLongPressWithHover) {
+    const executeSecondaryInteraction = (e) => {
+        if (DeviceCapabilities.hasHoverSupport() && !enableLongPressWithHover) {
             return;
         }
-        if (this.props.withoutFocusOnSecondaryInteraction && this.pressableRef) {
-            this.pressableRef.blur();
+        if (withoutFocusOnSecondaryInteraction && pressableRef.current) {
+            pressableRef.current.blur();
         }
-        this.props.onSecondaryInteraction(e);
-    }
+        onSecondaryInteraction(e);
+    };
 
-    /**
-     * @param {contextmenu} e - A right-click MouseEvent.
-     * https://developer.mozilla.org/en-US/docs/Web/API/Element/contextmenu_event
-     */
-    executeSecondaryInteractionOnContextMenu(e) {
-        if (!this.props.onSecondaryInteraction) {
+    useEffect(() => {
+        if (!pressableRef.current) {
             return;
         }
 
-        e.stopPropagation();
-        if (this.props.preventDefaultContextMenu) {
-            e.preventDefault();
+        if (forwardedRef) {
+            if (_.isFunction(forwardedRef)) {
+                forwardedRef(pressableRef.current);
+            } else if (_.isObject(forwardedRef)) {
+                // eslint-disable-next-line no-param-reassign
+                forwardedRef.current = pressableRef.current;
+            }
         }
 
-        this.props.onSecondaryInteraction(e);
+        const element = pressableRef.current;
+
         /**
-         * This component prevents the tapped element from capturing focus.
-         * We need to blur this element when clicked as it opens modal that implements focus-trapping.
-         * When the modal is closed it focuses back to the last active element.
-         * Therefore it shifts the element to bring it back to focus.
-         * https://github.com/Expensify/App/issues/14148
+         * @param {contextmenu} e - A right-click MouseEvent.
+         * https://developer.mozilla.org/en-US/docs/Web/API/Element/contextmenu_event
          */
-        if (this.props.withoutFocusOnSecondaryInteraction && this.pressableRef) {
-            this.pressableRef.blur();
-        }
-    }
-
-    render() {
-        const defaultPressableProps = _.omit(this.props, ['onSecondaryInteraction', 'children', 'onLongPress']);
-        const inlineStyle = this.props.inline ? styles.dInline : {};
-
-        // On Web, Text does not support LongPress events thus manage inline mode with styling instead of using Text.
-        return (
-            <PressableWithFeedback
-                wrapperStyle={StyleUtils.combineStyles(DeviceCapabilities.canUseTouchScreen() ? [styles.userSelectNone, styles.noSelect] : [], inlineStyle)}
-                onPressIn={this.props.onPressIn}
-                onLongPress={this.props.onSecondaryInteraction ? this.executeSecondaryInteraction : undefined}
-                pressDimmingValue={this.props.activeOpacity}
-                onPressOut={this.props.onPressOut}
-                onPress={this.props.onPress}
-                ref={(el) => (this.pressableRef = el)}
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...defaultPressableProps}
-                style={(state) => [StyleUtils.parseStyleFromFunction(this.props.style, state), inlineStyle]}
-            >
-                {this.props.children}
-            </PressableWithFeedback>
-        );
-    }
+        const executeSecondaryInteractionOnContextMenu = (e) => {
+            if (!onSecondaryInteraction) {
+                return;
+            }
+
+            e.stopPropagation();
+            if (preventDefaultContextMenu) {
+                e.preventDefault();
+            }
+
+            onSecondaryInteraction(e);
+
+            /**
+             * This component prevents the tapped element from capturing focus.
+             * We need to blur this element when clicked as it opens modal that implements focus-trapping.
+             * When the modal is closed it focuses back to the last active element.
+             * Therefore it shifts the element to bring it back to focus.
+             * https://github.com/Expensify/App/issues/14148
+             */
+            if (withoutFocusOnSecondaryInteraction) {
+                element.blur();
+            }
+        };
+
+        element.addEventListener('contextmenu', executeSecondaryInteractionOnContextMenu);
+
+        return () => {
+            element.removeEventListener('contextmenu', executeSecondaryInteractionOnContextMenu);
+        };
+    }, [forwardedRef, onSecondaryInteraction, preventDefaultContextMenu, withoutFocusOnSecondaryInteraction]);
+
+    const defaultPressableProps = _.omit(rest, ['onLongPress']);
+    const inlineStyle = inline ? styles.dInline : {};
+
+    // On Web, Text does not support LongPress events thus manage inline mode with styling instead of using Text.
+    return (
+        <PressableWithFeedback
+            wrapperStyle={StyleUtils.combineStyles(DeviceCapabilities.canUseTouchScreen() ? [styles.userSelectNone, styles.noSelect] : [], inlineStyle)}
+            onPressIn={onPressIn}
+            onLongPress={onSecondaryInteraction ? executeSecondaryInteraction : undefined}
+            pressDimmingValue={activeOpacity}
+            onPressOut={onPressOut}
+            onPress={onPress}
+            ref={pressableRef}
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...defaultPressableProps}
+            style={(state) => [StyleUtils.parseStyleFromFunction(style, state), inlineStyle]}
+        >
+            {children}
+        </PressableWithFeedback>
+    );
 }
 
 PressableWithSecondaryInteraction.propTypes = pressableWithSecondaryInteractionPropTypes.propTypes;
 PressableWithSecondaryInteraction.defaultProps = pressableWithSecondaryInteractionPropTypes.defaultProps;
-export default React.forwardRef((props, ref) => (
+PressableWithSecondaryInteraction.displayName = 'PressableWithSecondaryInteraction';
+
+export default forwardRef((props, ref) => (
     <PressableWithSecondaryInteraction
         // eslint-disable-next-line react/jsx-props-no-spreading
         {...props}
diff --git a/src/components/PressableWithSecondaryInteraction/pressableWithSecondaryInteractionPropTypes.js b/src/components/PressableWithSecondaryInteraction/pressableWithSecondaryInteractionPropTypes.js
index de0adbe81297..0a4f7949643a 100644
--- a/src/components/PressableWithSecondaryInteraction/pressableWithSecondaryInteractionPropTypes.js
+++ b/src/components/PressableWithSecondaryInteraction/pressableWithSecondaryInteractionPropTypes.js
@@ -12,7 +12,12 @@ const propTypes = {
     /** The function that should be called when this pressable is pressedOut */
     onPressOut: PropTypes.func,
 
-    /** The function that should be called when this pressable is LongPressed or right-clicked. */
+    /**
+     * The function that should be called when this pressable is LongPressed or right-clicked.
+     *
+     * This function should be stable, preferably wrapped in a `useCallback` so that it does not
+     * cause several re-renders.
+     */
     onSecondaryInteraction: PropTypes.func,
 
     /** The children which should be contained in this wrapper component. */
@@ -43,6 +48,9 @@ const propTypes = {
 
     /** Used to apply styles to the Pressable */
     style: stylePropTypes,
+
+    /** Whether the view needs to be rendered offscreen (for Android only) */
+    needsOffscreenAlphaCompositing: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -54,6 +62,7 @@ const defaultProps = {
     withoutFocusOnSecondaryInteraction: false,
     activeOpacity: 1,
     enableLongPressWithHover: false,
+    needsOffscreenAlphaCompositing: false,
 };
 
 export {propTypes, defaultProps};
diff --git a/src/components/QRShare/QRShareWithDownload/index.js b/src/components/QRShare/QRShareWithDownload/index.js
index 310122b96d40..665115823357 100644
--- a/src/components/QRShare/QRShareWithDownload/index.js
+++ b/src/components/QRShare/QRShareWithDownload/index.js
@@ -17,7 +17,9 @@ class QRShareWithDownload extends Component {
         return new Promise((resolve, reject) => {
             // eslint-disable-next-line es/no-optional-chaining
             const svg = this.qrShareRef.current?.getSvg();
-            if (svg == null) return reject();
+            if (svg == null) {
+                return reject();
+            }
 
             svg.toDataURL((dataURL) => resolve(fileDownload(dataURL, getQrCodeFileName(this.props.title))));
         });
diff --git a/src/components/QRShare/index.js b/src/components/QRShare/index.js
index 05ae4165ea8e..d96024ad1046 100644
--- a/src/components/QRShare/index.js
+++ b/src/components/QRShare/index.js
@@ -50,7 +50,7 @@ class QRShare extends Component {
             >
                 <View style={styles.expensifyQrLogo}>
                     <ExpensifyWordmark
-                        fill={defaultTheme.borderFocus}
+                        fill={defaultTheme.QRLogo}
                         width="100%"
                         height="100%"
                     />
diff --git a/src/components/Reactions/AddReactionBubble.js b/src/components/Reactions/AddReactionBubble.js
index 922be96084d8..0315c63aabf1 100644
--- a/src/components/Reactions/AddReactionBubble.js
+++ b/src/components/Reactions/AddReactionBubble.js
@@ -94,6 +94,7 @@ function AddReactionBubble(props) {
                 accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
                 // disable dimming
                 pressDimmingValue={1}
+                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
             >
                 {({hovered, pressed}) => (
                     <>
diff --git a/src/components/Reactions/EmojiReactionBubble.js b/src/components/Reactions/EmojiReactionBubble.js
index bb37735d6920..818bc8f33309 100644
--- a/src/components/Reactions/EmojiReactionBubble.js
+++ b/src/components/Reactions/EmojiReactionBubble.js
@@ -60,6 +60,7 @@ function EmojiReactionBubble(props) {
                 styles.emojiReactionBubble,
                 StyleUtils.getEmojiReactionBubbleStyle(hovered || pressed, props.hasUserReacted, props.isContextMenu),
                 props.shouldBlockReactions && styles.cursorDisabled,
+                styles.userSelectNone,
             ]}
             onPress={() => {
                 if (props.shouldBlockReactions) {
@@ -83,9 +84,10 @@ function EmojiReactionBubble(props) {
             }}
             accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
             accessibilityLabel={props.emojiCodes.join('')}
+            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
         >
-            <Text style={[styles.emojiReactionBubbleText, styles.userSelectNone, StyleUtils.getEmojiReactionBubbleTextStyle(props.isContextMenu)]}>{props.emojiCodes.join('')}</Text>
-            {props.count > 0 && <Text style={[styles.reactionCounterText, styles.userSelectNone, StyleUtils.getEmojiReactionCounterTextStyle(props.hasUserReacted)]}>{props.count}</Text>}
+            <Text style={[styles.emojiReactionBubbleText, StyleUtils.getEmojiReactionBubbleTextStyle(props.isContextMenu)]}>{props.emojiCodes.join('')}</Text>
+            {props.count > 0 && <Text style={[styles.reactionCounterText, StyleUtils.getEmojiReactionCounterTextStyle(props.hasUserReacted)]}>{props.count}</Text>}
         </PressableWithSecondaryInteraction>
     );
 }
diff --git a/src/components/Reactions/MiniQuickEmojiReactions.js b/src/components/Reactions/MiniQuickEmojiReactions.js
index 82f83cb1e961..a22a2967cefe 100644
--- a/src/components/Reactions/MiniQuickEmojiReactions.js
+++ b/src/components/Reactions/MiniQuickEmojiReactions.js
@@ -80,7 +80,12 @@ function MiniQuickEmojiReactions(props) {
                     tooltipText={`:${EmojiUtils.getLocalizedEmojiName(emoji.name, props.preferredLocale)}:`}
                     onPress={Session.checkIfActionIsAllowed(() => props.onEmojiSelected(emoji, props.emojiReactions))}
                 >
-                    <Text style={[styles.miniQuickEmojiReactionText, styles.userSelectNone]}>{EmojiUtils.getPreferredEmojiCode(emoji, props.preferredSkinTone)}</Text>
+                    <Text
+                        style={[styles.miniQuickEmojiReactionText, styles.userSelectNone]}
+                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                    >
+                        {EmojiUtils.getPreferredEmojiCode(emoji, props.preferredSkinTone)}
+                    </Text>
                 </BaseMiniContextMenuItem>
             ))}
             <BaseMiniContextMenuItem
diff --git a/src/components/Reactions/QuickEmojiReactions/BaseQuickEmojiReactions.js b/src/components/Reactions/QuickEmojiReactions/BaseQuickEmojiReactions.js
index 69ff37338c2d..b5046fbd59ce 100644
--- a/src/components/Reactions/QuickEmojiReactions/BaseQuickEmojiReactions.js
+++ b/src/components/Reactions/QuickEmojiReactions/BaseQuickEmojiReactions.js
@@ -80,7 +80,7 @@ function BaseQuickEmojiReactions(props) {
                 isContextMenu
                 onPressOpenPicker={props.onPressOpenPicker}
                 onWillShowPicker={props.onWillShowPicker}
-                onSelectEmoji={props.onEmojiSelected}
+                onSelectEmoji={(emoji) => props.onEmojiSelected(emoji, props.emojiReactions)}
                 reportAction={props.reportAction}
             />
         </View>
diff --git a/src/components/Reactions/ReportActionItemEmojiReactions.js b/src/components/Reactions/ReportActionItemEmojiReactions.js
index ec2755f1a5dd..e72c9d9381fa 100644
--- a/src/components/Reactions/ReportActionItemEmojiReactions.js
+++ b/src/components/Reactions/ReportActionItemEmojiReactions.js
@@ -13,7 +13,7 @@ import EmojiReactionsPropTypes from './EmojiReactionsPropTypes';
 import Tooltip from '../Tooltip';
 import ReactionTooltipContent from './ReactionTooltipContent';
 import * as EmojiUtils from '../../libs/EmojiUtils';
-import ReportScreenContext from '../../pages/home/ReportScreenContext';
+import {ReactionListContext} from '../../pages/home/ReportScreenContext';
 
 const propTypes = {
     emojiReactions: EmojiReactionsPropTypes,
@@ -41,8 +41,9 @@ const defaultProps = {
 };
 
 function ReportActionItemEmojiReactions(props) {
-    const {reactionListRef} = useContext(ReportScreenContext);
-    const popoverReactionListAnchor = useRef(null);
+    const reactionListRef = useContext(ReactionListContext);
+    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 +96,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 +113,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 +133,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/ReimbursementAccountLoadingIndicator.js b/src/components/ReimbursementAccountLoadingIndicator.js
index 61a602be0bda..21aac35f4005 100644
--- a/src/components/ReimbursementAccountLoadingIndicator.js
+++ b/src/components/ReimbursementAccountLoadingIndicator.js
@@ -4,14 +4,12 @@ import PropTypes from 'prop-types';
 import Lottie from 'lottie-react-native';
 import * as LottieAnimations from './LottieAnimations';
 import styles from '../styles/styles';
-import withLocalize, {withLocalizePropTypes} from './withLocalize';
+import useLocalize from '../hooks/useLocalize';
 import Text from './Text';
 import HeaderWithBackButton from './HeaderWithBackButton';
 import ScreenWrapper from './ScreenWrapper';
 import FullScreenLoadingIndicator from './FullscreenLoadingIndicator';
 import FullPageOfflineBlockingView from './BlockingViews/FullPageOfflineBlockingView';
-import compose from '../libs/compose';
-import {withNetwork} from './OnyxProvider';
 
 const propTypes = {
     /** Whether the user is submitting verifications data */
@@ -19,17 +17,18 @@ const propTypes = {
 
     /** Method to trigger when pressing back button of the header */
     onBackButtonPress: PropTypes.func.isRequired,
-    ...withLocalizePropTypes,
 };
 
 function ReimbursementAccountLoadingIndicator(props) {
+    const {translate} = useLocalize();
     return (
         <ScreenWrapper
             shouldShowOfflineIndicator={false}
             style={[StyleSheet.absoluteFillObject, styles.reimbursementAccountFullScreenLoading]}
+            testID={ReimbursementAccountLoadingIndicator.displayName}
         >
             <HeaderWithBackButton
-                title={props.translate('reimbursementAccountLoadingAnimation.oneMoment')}
+                title={translate('reimbursementAccountLoadingAnimation.oneMoment')}
                 onBackButtonPress={props.onBackButtonPress}
             />
             <FullPageOfflineBlockingView>
@@ -42,7 +41,7 @@ function ReimbursementAccountLoadingIndicator(props) {
                             style={styles.loadingVBAAnimation}
                         />
                         <View style={[styles.ph6]}>
-                            <Text style={[styles.textAlignCenter]}>{props.translate('reimbursementAccountLoadingAnimation.explanationLine')}</Text>
+                            <Text style={[styles.textAlignCenter]}>{translate('reimbursementAccountLoadingAnimation.explanationLine')}</Text>
                         </View>
                     </View>
                 ) : (
@@ -56,4 +55,4 @@ function ReimbursementAccountLoadingIndicator(props) {
 ReimbursementAccountLoadingIndicator.propTypes = propTypes;
 ReimbursementAccountLoadingIndicator.displayName = 'ReimbursementAccountLoadingIndicator';
 
-export default compose(withLocalize, withNetwork())(ReimbursementAccountLoadingIndicator);
+export default ReimbursementAccountLoadingIndicator;
diff --git a/src/components/ReportActionItem/MoneyReportView.js b/src/components/ReportActionItem/MoneyReportView.js
index f863c8994c6f..f593d947f96c 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';
@@ -14,6 +15,7 @@ import variables from '../../styles/variables';
 import * as CurrencyUtils from '../../libs/CurrencyUtils';
 import EmptyStateBackgroundImage from '../../../assets/images/empty-state_background-fade.png';
 import useLocalize from '../../hooks/useLocalize';
+import SpacerView from '../SpacerView';
 
 const propTypes = {
     /** The report currently being looked at */
@@ -50,10 +52,10 @@ function MoneyReportView(props) {
                 </View>
                 <View style={[styles.flexRow, styles.justifyContentCenter]}>
                     {isSettled && (
-                        <View style={[styles.defaultCheckmarkWrapper, styles.mh1]}>
+                        <View style={[styles.defaultCheckmarkWrapper, styles.mh2]}>
                             <Icon
                                 src={Expensicons.Checkmark}
-                                fill={styles.success}
+                                fill={themeColors.success}
                             />
                         </View>
                     )}
@@ -65,7 +67,10 @@ function MoneyReportView(props) {
                     </Text>
                 </View>
             </View>
-            {props.shouldShowHorizontalRule && <View style={styles.reportHorizontalRule} />}
+            <SpacerView
+                shouldShow={props.shouldShowHorizontalRule}
+                style={[props.shouldShowHorizontalRule ? styles.reportHorizontalRule : {}]}
+            />
         </View>
     );
 }
diff --git a/src/components/ReportActionItem/MoneyRequestAction.js b/src/components/ReportActionItem/MoneyRequestAction.js
index 3b310bb6b4fa..b4a5e010b7a8 100644
--- a/src/components/ReportActionItem/MoneyRequestAction.js
+++ b/src/components/ReportActionItem/MoneyRequestAction.js
@@ -98,7 +98,7 @@ function MoneyRequestAction({
     const onMoneyRequestPreviewPressed = () => {
         if (isSplitBillAction) {
             const reportActionID = lodashGet(action, 'reportActionID', '0');
-            Navigation.navigate(ROUTES.getSplitBillDetailsRoute(chatReportID, reportActionID));
+            Navigation.navigate(ROUTES.SPLIT_BILL_DETAILS.getRoute(chatReportID, reportActionID));
             return;
         }
 
@@ -108,11 +108,11 @@ function MoneyRequestAction({
             const thread = ReportUtils.buildTransactionThread(action, requestReportID);
             const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread.participantAccountIDs);
             Report.openReport(thread.reportID, userLogins, thread, action.reportActionID);
-            Navigation.navigate(ROUTES.getReportRoute(thread.reportID));
+            Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(thread.reportID));
             return;
         }
         Report.openReport(childReportID);
-        Navigation.navigate(ROUTES.getReportRoute(childReportID));
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(childReportID));
     };
 
     let shouldShowPendingConversionMessage = false;
diff --git a/src/components/ReportActionItem/MoneyRequestPreview.js b/src/components/ReportActionItem/MoneyRequestPreview.js
index 02da03225062..35215cadd15d 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview.js
+++ b/src/components/ReportActionItem/MoneyRequestPreview.js
@@ -23,6 +23,7 @@ import * as DeviceCapabilities from '../../libs/DeviceCapabilities';
 import reportActionPropTypes from '../../pages/home/report/reportActionPropTypes';
 import {showContextMenuForReport} from '../ShowContextMenuContext';
 import * as OptionsListUtils from '../../libs/OptionsListUtils';
+import * as ReportActionsUtils from '../../libs/ReportActionsUtils';
 import * as CurrencyUtils from '../../libs/CurrencyUtils';
 import * as IOUUtils from '../../libs/IOUUtils';
 import * as ReportUtils from '../../libs/ReportUtils';
@@ -33,7 +34,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';
@@ -164,24 +164,21 @@ function MoneyRequestPreview(props) {
     const isScanning = hasReceipt && TransactionUtils.isReceiptBeingScanned(props.transaction);
     const hasFieldErrors = TransactionUtils.hasMissingSmartscanFields(props.transaction);
     const isDistanceRequest = TransactionUtils.isDistanceRequest(props.transaction);
+    const isSettled = ReportUtils.isSettled(props.iouReport);
 
     // Show the merchant for IOUs and expenses only if they are custom or not related to scanning smartscan
     const shouldShowMerchant =
         !_.isEmpty(requestMerchant) && !props.isBillSplit && requestMerchant !== CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT && requestMerchant !== CONST.TRANSACTION.DEFAULT_MERCHANT;
     const shouldShowDescription = !_.isEmpty(description) && !shouldShowMerchant;
 
-    const receiptImages = hasReceipt ? [ReceiptUtils.getThumbnailAndImageURIs(props.transaction.receipt.source, props.transaction.filename || props.transaction.receiptFilename || '')] : [];
+    const receiptImages = hasReceipt ? [ReceiptUtils.getThumbnailAndImageURIs(props.transaction.receipt.source, props.transaction.filename || '')] : [];
 
     const getSettledMessage = () => {
         switch (lodashGet(props.action, 'originalMessage.paymentType', '')) {
-            case CONST.IOU.PAYMENT_TYPE.PAYPAL_ME:
-                return props.translate('iou.settledPaypalMe');
-            case CONST.IOU.PAYMENT_TYPE.ELSEWHERE:
-                return props.translate('iou.settledElsewhere');
             case CONST.IOU.PAYMENT_TYPE.EXPENSIFY:
                 return props.translate('iou.settledExpensify');
             default:
-                return '';
+                return props.translate('iou.settledElsewhere');
         }
     };
 
@@ -236,21 +233,28 @@ function MoneyRequestPreview(props) {
                 errorRowStyles={[styles.mbn1]}
                 needsOffscreenAlphaCompositing
             >
-                <View style={[styles.moneyRequestPreviewBox, isScanning || props.isWhisper ? styles.reportPreviewBoxHoverBorder : undefined, ...props.containerStyles]}>
+                <View
+                    style={[
+                        isScanning || props.isWhisper ? [styles.reportPreviewBoxHoverBorder, styles.reportContainerBorderRadius] : undefined,
+                        !props.onPreviewPressed ? [styles.moneyRequestPreviewBox, ...props.containerStyles] : {},
+                    ]}
+                >
                     {hasReceipt && (
                         <ReportActionItemImages
                             images={receiptImages}
                             isHovered={isScanning}
                         />
                     )}
-                    {_.isEmpty(props.transaction) ? (
+                    {_.isEmpty(props.transaction) &&
+                    !ReportActionsUtils.isMessageDeleted(props.action) &&
+                    lodashGet(props.action, 'pendingAction') !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? (
                         <MoneyRequestSkeletonView />
                     ) : (
                         <View style={styles.moneyRequestPreviewBoxText}>
                             <View style={[styles.flexRow]}>
                                 <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
                                     <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh20]}>{getPreviewHeaderText()}</Text>
-                                    {Boolean(getSettledMessage()) && (
+                                    {isSettled && (
                                         <>
                                             <Icon
                                                 src={Expensicons.DotIndicator}
@@ -265,7 +269,7 @@ function MoneyRequestPreview(props) {
                                 {hasFieldErrors && (
                                     <Icon
                                         src={Expensicons.DotIndicator}
-                                        fill={colors.red}
+                                        fill={themeColors.danger}
                                     />
                                 )}
                             </View>
@@ -306,15 +310,15 @@ function MoneyRequestPreview(props) {
                                     <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh20, styles.breakWord]}>{requestMerchant}</Text>
                                 </View>
                             )}
-                            <View style={[styles.flexRow]}>
+                            <View style={[styles.flexRow, styles.mt1]}>
                                 <View style={[styles.flex1]}>
                                     {!isCurrentUserManager && props.shouldShowPendingConversionMessage && (
-                                        <Text style={[styles.textLabel, styles.colorMuted, styles.mt1]}>{props.translate('iou.pendingConversionMessage')}</Text>
+                                        <Text style={[styles.textLabel, styles.colorMuted]}>{props.translate('iou.pendingConversionMessage')}</Text>
                                     )}
-                                    {shouldShowDescription && <Text style={[styles.mt1, styles.colorMuted]}>{description}</Text>}
+                                    {shouldShowDescription && <Text style={[styles.colorMuted]}>{description}</Text>}
                                 </View>
                                 {props.isBillSplit && !_.isEmpty(participantAccountIDs) && (
-                                    <Text style={[styles.textLabel, styles.colorMuted, styles.ml1]}>
+                                    <Text style={[styles.textLabel, styles.colorMuted, styles.ml1, styles.amountSplitPadding]}>
                                         {props.translate('iou.amountEach', {
                                             amount: CurrencyUtils.convertToDisplayString(
                                                 IOUUtils.calculateAmount(isPolicyExpenseChat ? 1 : participantAccountIDs.length - 1, requestAmount, requestCurrency),
@@ -343,6 +347,7 @@ function MoneyRequestPreview(props) {
             onLongPress={showContextMenu}
             accessibilityLabel={props.isBillSplit ? props.translate('iou.split') : props.translate('iou.cash')}
             accessibilityHint={CurrencyUtils.convertToDisplayString(requestAmount, requestCurrency)}
+            style={[styles.moneyRequestPreviewBox, ...props.containerStyles]}
         >
             {childContainer}
         </PressableWithFeedback>
diff --git a/src/components/ReportActionItem/MoneyRequestView.js b/src/components/ReportActionItem/MoneyRequestView.js
index a9264812b99d..808babdec779 100644
--- a/src/components/ReportActionItem/MoneyRequestView.js
+++ b/src/components/ReportActionItem/MoneyRequestView.js
@@ -1,19 +1,25 @@
-import React from 'react';
+import React, {useMemo} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import lodashGet from 'lodash/get';
+import lodashValues from 'lodash/values';
 import PropTypes from 'prop-types';
 import reportPropTypes from '../../pages/reportPropTypes';
 import ONYXKEYS from '../../ONYXKEYS';
 import ROUTES from '../../ROUTES';
+import Permissions from '../../libs/Permissions';
 import Navigation from '../../libs/Navigation/Navigation';
 import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes} from '../withCurrentUserPersonalDetails';
 import compose from '../../libs/compose';
 import MenuItemWithTopDescription from '../MenuItemWithTopDescription';
 import styles from '../../styles/styles';
+import themeColors from '../../styles/themes/default';
 import * as ReportUtils from '../../libs/ReportUtils';
+import * as IOU from '../../libs/actions/IOU';
+import * as OptionsListUtils from '../../libs/OptionsListUtils';
 import * as ReportActionsUtils from '../../libs/ReportActionsUtils';
 import * as StyleUtils from '../../styles/StyleUtils';
+import * as PolicyUtils from '../../libs/PolicyUtils';
 import CONST from '../../CONST';
 import * as Expensicons from '../Icon/Expensicons';
 import iouReportPropTypes from '../../pages/iouReportPropTypes';
@@ -24,39 +30,56 @@ import * as ReceiptUtils from '../../libs/ReceiptUtils';
 import useWindowDimensions from '../../hooks/useWindowDimensions';
 import transactionPropTypes from '../transactionPropTypes';
 import Image from '../Image';
+import Text from '../Text';
+import Switch from '../Switch';
 import ReportActionItemImage from './ReportActionItemImage';
 import * as TransactionUtils from '../../libs/TransactionUtils';
 import OfflineWithFeedback from '../OfflineWithFeedback';
+import categoryPropTypes from '../categoryPropTypes';
+import SpacerView from '../SpacerView';
+import tagPropTypes from '../tagPropTypes';
 
 const propTypes = {
     /** The report currently being looked at */
     report: reportPropTypes.isRequired,
 
+    /** Whether we should display the horizontal rule below the component */
+    shouldShowHorizontalRule: PropTypes.bool.isRequired,
+
+    /* Onyx Props */
+    /** List of betas available to current user */
+    betas: PropTypes.arrayOf(PropTypes.string),
+
     /** The expense report or iou report (only will have a value if this is a transaction thread) */
     parentReport: iouReportPropTypes,
 
+    /** Collection of categories attached to a policy */
+    policyCategories: PropTypes.objectOf(categoryPropTypes),
+
     /** The transaction associated with the transactionThread */
     transaction: transactionPropTypes,
 
-    /** Whether we should display the horizontal rule below the component */
-    shouldShowHorizontalRule: PropTypes.bool.isRequired,
+    /** Collection of tags attached to a policy */
+    policyTags: tagPropTypes,
 
     ...withCurrentUserPersonalDetailsPropTypes,
 };
 
 const defaultProps = {
+    betas: [],
     parentReport: {},
+    policyCategories: {},
     transaction: {
         amount: 0,
         currency: CONST.CURRENCY.USD,
         comment: {comment: ''},
     },
+    policyTags: {},
 };
 
-function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, transaction}) {
+function MoneyRequestView({report, betas, parentReport, policyCategories, shouldShowHorizontalRule, transaction, policyTags, policy}) {
     const {isSmallScreenWidth} = useWindowDimensions();
     const {translate} = useLocalize();
-
     const parentReportAction = ReportActionsUtils.getParentReportAction(report);
     const moneyRequestReport = parentReport;
     const {
@@ -65,6 +88,9 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans
         currency: transactionCurrency,
         comment: transactionDescription,
         merchant: transactionMerchant,
+        billable: transactionBillable,
+        category: transactionCategory,
+        tag: transactionTag,
     } = ReportUtils.getTransactionDetails(transaction);
     const isEmptyMerchant =
         transactionMerchant === '' || transactionMerchant === CONST.TRANSACTION.UNKNOWN_MERCHANT || transactionMerchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT;
@@ -72,6 +98,17 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans
 
     const isSettled = ReportUtils.isSettled(moneyRequestReport.reportID);
     const canEdit = ReportUtils.canEditMoneyRequest(parentReportAction);
+    // A flag for verifying that the current report is a sub-report of a workspace chat
+    const isPolicyExpenseChat = useMemo(() => ReportUtils.isPolicyExpenseChat(ReportUtils.getRootParentReport(report)), [report]);
+
+    // Fetches only the first tag, for now
+    const policyTag = PolicyUtils.getTag(policyTags);
+    const policyTagsList = lodashGet(policyTag, 'tags', {});
+
+    // Flags for showing categories and tags
+    const shouldShowCategory = isPolicyExpenseChat && Permissions.canUseCategories(betas) && (transactionCategory || OptionsListUtils.hasEnabledOptions(lodashValues(policyCategories)));
+    const shouldShowTag = isPolicyExpenseChat && Permissions.canUseTags(betas) && (transactionTag || OptionsListUtils.hasEnabledOptions(lodashValues(policyTagsList)));
+    const shouldShowBillable = isPolicyExpenseChat && Permissions.canUseTags(betas) && (transactionBillable || !lodashGet(policy, 'disabledFields.defaultBillable', true));
 
     let description = `${translate('iou.amount')} • ${translate('iou.cash')}`;
     if (isSettled) {
@@ -91,10 +128,12 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans
     let hasErrors = false;
     if (hasReceipt) {
         receiptURIs = ReceiptUtils.getThumbnailAndImageURIs(transaction.receipt.source, transaction.filename);
-        hasErrors = TransactionUtils.hasMissingSmartscanFields(transaction);
+        hasErrors = canEdit && TransactionUtils.hasMissingSmartscanFields(transaction);
     }
 
     const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);
+    const pendingAction = lodashGet(transaction, 'pendingAction');
+    const getPendingFieldAction = (fieldPath) => lodashGet(transaction, fieldPath) || pendingAction;
 
     return (
         <View>
@@ -105,16 +144,19 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans
                     style={[StyleUtils.getReportWelcomeBackgroundImageStyle(true)]}
                 />
             </View>
+
             {hasReceipt && (
-                <View style={styles.moneyRequestViewImage}>
-                    <ReportActionItemImage
-                        thumbnail={receiptURIs.thumbnail}
-                        image={receiptURIs.image}
-                        enablePreviewModal
-                    />
-                </View>
+                <OfflineWithFeedback pendingAction={pendingAction}>
+                    <View style={styles.moneyRequestViewImage}>
+                        <ReportActionItemImage
+                            thumbnail={receiptURIs.thumbnail}
+                            image={receiptURIs.image}
+                            enablePreviewModal
+                        />
+                    </View>
+                </OfflineWithFeedback>
             )}
-            <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.amount') || lodashGet(transaction, 'pendingAction')}>
+            <OfflineWithFeedback pendingAction={getPendingFieldAction('pendingFields.amount')}>
                 <MenuItemWithTopDescription
                     title={formattedTransactionAmount ? formattedTransactionAmount.toString() : ''}
                     shouldShowTitleIcon={isSettled}
@@ -123,49 +165,100 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans
                     titleStyle={styles.newKansasLarge}
                     interactive={canEdit}
                     shouldShowRightIcon={canEdit}
-                    onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.AMOUNT))}
+                    onPress={() => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.AMOUNT))}
                     brickRoadIndicator={hasErrors && transactionAmount === 0 ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''}
-                    subtitle={hasErrors && transactionAmount === 0 ? translate('common.error.enterAmount') : ''}
-                    subtitleTextStyle={styles.textLabelError}
+                    error={hasErrors && transactionAmount === 0 ? translate('common.error.enterAmount') : ''}
                 />
             </OfflineWithFeedback>
-            <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.comment') || lodashGet(transaction, 'pendingAction')}>
+            <OfflineWithFeedback pendingAction={getPendingFieldAction('pendingFields.comment')}>
                 <MenuItemWithTopDescription
                     description={translate('common.description')}
+                    shouldParseTitle
                     title={transactionDescription}
                     interactive={canEdit}
                     shouldShowRightIcon={canEdit}
                     titleStyle={styles.flex1}
-                    onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.DESCRIPTION))}
+                    onPress={() => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.DESCRIPTION))}
+                    wrapperStyle={[styles.pv2, styles.taskDescriptionMenuItem]}
+                    numberOfLinesTitle={0}
                 />
             </OfflineWithFeedback>
-            <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.created') || lodashGet(transaction, 'pendingAction')}>
+            <OfflineWithFeedback pendingAction={getPendingFieldAction('pendingFields.created')}>
                 <MenuItemWithTopDescription
                     description={translate('common.date')}
                     title={transactionDate}
                     interactive={canEdit}
                     shouldShowRightIcon={canEdit}
                     titleStyle={styles.flex1}
-                    onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.DATE))}
+                    onPress={() => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.DATE))}
                     brickRoadIndicator={hasErrors && transactionDate === '' ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''}
-                    subtitle={hasErrors && transactionDate === '' ? translate('common.error.enterDate') : ''}
-                    subtitleTextStyle={styles.textLabelError}
-                />
-            </OfflineWithFeedback>
-            <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.merchant') || lodashGet(transaction, 'pendingAction')}>
-                <MenuItemWithTopDescription
-                    description={isDistanceRequest ? translate('common.distance') : translate('common.merchant')}
-                    title={transactionMerchant}
-                    interactive={canEdit}
-                    shouldShowRightIcon={canEdit}
-                    titleStyle={styles.flex1}
-                    onPress={() => Navigation.navigate(ROUTES.getEditRequestRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.MERCHANT))}
-                    brickRoadIndicator={hasErrors && isEmptyMerchant ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''}
-                    subtitle={hasErrors && isEmptyMerchant ? translate('common.error.enterMerchant') : ''}
-                    subtitleTextStyle={styles.textLabelError}
+                    error={hasErrors && transactionDate === '' ? translate('common.error.enterDate') : ''}
                 />
             </OfflineWithFeedback>
-            {shouldShowHorizontalRule && <View style={styles.reportHorizontalRule} />}
+            {isDistanceRequest ? (
+                <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.waypoints') || lodashGet(transaction, 'pendingAction')}>
+                    <MenuItemWithTopDescription
+                        description={translate('common.distance')}
+                        title={transactionMerchant}
+                        interactive={canEdit}
+                        shouldShowRightIcon={canEdit}
+                        titleStyle={styles.flex1}
+                        onPress={() => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.DISTANCE))}
+                    />
+                </OfflineWithFeedback>
+            ) : (
+                <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.merchant') || lodashGet(transaction, 'pendingAction')}>
+                    <MenuItemWithTopDescription
+                        description={translate('common.merchant')}
+                        title={transactionMerchant}
+                        interactive={canEdit}
+                        shouldShowRightIcon={canEdit}
+                        titleStyle={styles.flex1}
+                        onPress={() => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.MERCHANT))}
+                        brickRoadIndicator={hasErrors && isEmptyMerchant ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''}
+                        subtitle={hasErrors && isEmptyMerchant ? translate('common.error.enterMerchant') : ''}
+                        subtitleTextStyle={styles.textLabelError}
+                    />
+                </OfflineWithFeedback>
+            )}
+            {shouldShowCategory && (
+                <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.category') || lodashGet(transaction, 'pendingAction')}>
+                    <MenuItemWithTopDescription
+                        description={translate('common.category')}
+                        title={transactionCategory}
+                        interactive={canEdit}
+                        shouldShowRightIcon={canEdit}
+                        titleStyle={styles.flex1}
+                        onPress={() => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.CATEGORY))}
+                    />
+                </OfflineWithFeedback>
+            )}
+            {shouldShowTag && (
+                <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.tag') || lodashGet(transaction, 'pendingAction')}>
+                    <MenuItemWithTopDescription
+                        description={lodashGet(policyTag, 'name', translate('common.tag'))}
+                        title={transactionTag}
+                        interactive={canEdit}
+                        shouldShowRightIcon={canEdit}
+                        titleStyle={styles.flex1}
+                        onPress={() => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.TAG))}
+                    />
+                </OfflineWithFeedback>
+            )}
+            {shouldShowBillable && (
+                <View style={[styles.flexRow, styles.mb4, styles.justifyContentBetween, styles.alignItemsCenter, styles.ml5, styles.mr8]}>
+                    <Text color={!transactionBillable ? themeColors.textSupporting : undefined}>{translate('common.billable')}</Text>
+                    <Switch
+                        accessibilityLabel={translate('common.billable')}
+                        isOn={transactionBillable}
+                        onToggle={(value) => IOU.editMoneyRequest(transaction.transactionID, report.reportID, {billable: value})}
+                    />
+                </View>
+            )}
+            <SpacerView
+                shouldShow={shouldShowHorizontalRule}
+                style={[shouldShowHorizontalRule ? styles.reportHorizontalRule : {}]}
+            />
         </View>
     );
 }
@@ -177,12 +270,18 @@ MoneyRequestView.displayName = 'MoneyRequestView';
 export default compose(
     withCurrentUserPersonalDetails,
     withOnyx({
+        betas: {
+            key: ONYXKEYS.BETAS,
+        },
         parentReport: {
             key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`,
         },
         policy: {
             key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`,
         },
+        policyCategories: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report.policyID}`,
+        },
         session: {
             key: ONYXKEYS.SESSION,
         },
@@ -193,5 +292,8 @@ export default compose(
                 return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
             },
         },
+        policyTags: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report.policyID}`,
+        },
     }),
 )(MoneyRequestView);
diff --git a/src/components/ReportActionItem/ReportActionItemImage.js b/src/components/ReportActionItem/ReportActionItemImage.js
index 070f534f4924..98bdede0fe26 100644
--- a/src/components/ReportActionItem/ReportActionItemImage.js
+++ b/src/components/ReportActionItem/ReportActionItemImage.js
@@ -59,7 +59,7 @@ function ReportActionItemImage({thumbnail, image, enablePreviewModal}) {
                     <PressableWithoutFocus
                         style={[styles.noOutline, styles.w100, styles.h100]}
                         onPress={() => {
-                            const route = ROUTES.getReportAttachmentRoute(report.reportID, imageSource);
+                            const route = ROUTES.REPORT_ATTACHMENTS.getRoute(report.reportID, imageSource);
                             Navigation.navigate(route);
                         }}
                         accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
diff --git a/src/components/ReportActionItem/ReportActionItemImages.js b/src/components/ReportActionItem/ReportActionItemImages.js
index e8e3aa8e8c40..7e6287720952 100644
--- a/src/components/ReportActionItem/ReportActionItemImages.js
+++ b/src/components/ReportActionItem/ReportActionItemImages.js
@@ -11,7 +11,7 @@ const propTypes = {
     images: PropTypes.arrayOf(
         PropTypes.shape({
             thumbnail: PropTypes.string,
-            image: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+            image: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
         }),
     ).isRequired,
 
diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js
index b95fdaad1025..a79cfd315b12 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', '');
 
@@ -120,9 +120,7 @@ function ReportPreview(props) {
     const isScanning = hasReceipts && ReportUtils.areAllRequestsBeingSmartScanned(props.iouReportID, props.action);
     const hasErrors = hasReceipts && ReportUtils.hasMissingSmartscanFields(props.iouReportID);
     const lastThreeTransactionsWithReceipts = ReportUtils.getReportPreviewDisplayTransactions(props.action);
-    const lastThreeReceipts = _.map(lastThreeTransactionsWithReceipts, ({receipt, filename, receiptFilename}) =>
-        ReceiptUtils.getThumbnailAndImageURIs(receipt.source, filename || receiptFilename || ''),
-    );
+    const lastThreeReceipts = _.map(lastThreeTransactionsWithReceipts, ({receipt, filename}) => ReceiptUtils.getThumbnailAndImageURIs(receipt.source, filename || ''));
 
     const hasOnlyOneReceiptRequest = numberOfRequests === 1 && hasReceipts;
     const previewSubtitle = hasOnlyOneReceiptRequest
@@ -165,19 +163,19 @@ 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]}>
             <PressableWithoutFeedback
                 onPress={() => {
-                    Navigation.navigate(ROUTES.getReportRoute(props.iouReportID));
+                    Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(props.iouReportID));
                 }}
                 onPressIn={() => DeviceCapabilities.canUseTouchScreen() && ControlSelection.block()}
                 onPressOut={() => ControlSelection.unblock()}
                 onLongPress={(event) => showContextMenuForReport(event, props.contextMenuAnchor, props.chatReportID, props.action, props.checkIfContextMenuActive)}
-                style={[styles.flexRow, styles.justifyContentBetween]}
+                style={[styles.flexRow, styles.justifyContentBetween, styles.reportPreviewBox]}
                 accessibilityRole="button"
                 accessibilityLabel={props.translate('iou.viewDetails')}
             >
@@ -198,7 +196,7 @@ function ReportPreview(props) {
                             {hasErrors && (
                                 <Icon
                                     src={Expensicons.DotIndicator}
-                                    fill={colors.red}
+                                    fill={themeColors.danger}
                                 />
                             )}
                         </View>
@@ -229,7 +227,7 @@ function ReportPreview(props) {
                                 chatReportID={props.chatReportID}
                                 iouReport={props.iouReport}
                                 onPress={(paymentType) => IOU.payMoneyRequest(paymentType, props.chatReport, props.iouReport)}
-                                enablePaymentsRoute={ROUTES.BANK_ACCOUNT_NEW}
+                                enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
                                 addBankAccountRoute={bankAccountRoute}
                                 style={[styles.requestPreviewBox]}
                             />
diff --git a/src/components/ReportActionItem/TaskAction.js b/src/components/ReportActionItem/TaskAction.js
index c0b60ad996db..9d32fa7a1e77 100644
--- a/src/components/ReportActionItem/TaskAction.js
+++ b/src/components/ReportActionItem/TaskAction.js
@@ -1,13 +1,10 @@
 import React from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
-import {withOnyx} from 'react-native-onyx';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
-import compose from '../../libs/compose';
-import ONYXKEYS from '../../ONYXKEYS';
 import Text from '../Text';
 import styles from '../../styles/styles';
-import CONST from '../../CONST';
+import * as Task from '../../libs/actions/Task';
 
 const propTypes = {
     /** Name of the reportAction action */
@@ -17,60 +14,20 @@ const propTypes = {
     // eslint-disable-next-line react/no-unused-prop-types -- This is used in the withOnyx HOC
     taskReportID: PropTypes.string.isRequired,
 
-    /* Onyx Props */
-    taskReport: PropTypes.shape({
-        /** Title of the task */
-        reportName: PropTypes.string,
-
-        /** AccountID of the manager in this iou report */
-        managerID: PropTypes.number,
-
-        /** AccountID of the creator of this iou report */
-        ownerAccountID: PropTypes.number,
-    }),
-
     ...withLocalizePropTypes,
 };
 
-const defaultProps = {
-    taskReport: {},
-};
 function TaskAction(props) {
-    const taskReportName = props.taskReport.reportName || '';
-
-    let taskStatusText = '';
-    switch (props.actionName) {
-        case CONST.REPORT.ACTIONS.TYPE.TASKCOMPLETED:
-            taskStatusText = props.translate('task.messages.completed');
-            break;
-        case CONST.REPORT.ACTIONS.TYPE.TASKCANCELLED:
-            taskStatusText = props.translate('task.messages.canceled');
-            break;
-        case CONST.REPORT.ACTIONS.TYPE.TASKREOPENED:
-            taskStatusText = props.translate('task.messages.reopened');
-            break;
-        default:
-            taskStatusText = props.translate('task.task');
-    }
-
     return (
         <>
             <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
-                <Text style={[styles.chatItemMessage, styles.colorMuted]}>{`${taskStatusText} ${taskReportName}`}</Text>
+                <Text style={[styles.chatItemMessage, styles.colorMuted]}>{Task.getTaskReportActionMessage(props.actionName, props.taskReportID, false)}</Text>
             </View>
         </>
     );
 }
 
 TaskAction.propTypes = propTypes;
-TaskAction.defaultProps = defaultProps;
 TaskAction.displayName = 'TaskAction';
 
-export default compose(
-    withLocalize,
-    withOnyx({
-        taskReport: {
-            key: ({taskReportID}) => `${ONYXKEYS.COLLECTION.REPORT}${taskReportID}`,
-        },
-    }),
-)(TaskAction);
+export default withLocalize(TaskAction);
diff --git a/src/components/ReportActionItem/TaskPreview.js b/src/components/ReportActionItem/TaskPreview.js
index ca4103624440..87c8291ab05f 100644
--- a/src/components/ReportActionItem/TaskPreview.js
+++ b/src/components/ReportActionItem/TaskPreview.js
@@ -23,6 +23,7 @@ import RenderHTML from '../RenderHTML';
 import PressableWithoutFeedback from '../Pressable/PressableWithoutFeedback';
 import personalDetailsPropType from '../../pages/personalDetailsPropType';
 import * as Session from '../../libs/actions/Session';
+import * as LocalePhoneNumber from '../../libs/LocalePhoneNumber';
 
 const propTypes = {
     /** All personal details asssociated with user */
@@ -70,13 +71,18 @@ function TaskPreview(props) {
     const taskAssigneeAccountID = Task.getTaskAssigneeAccountID(props.taskReport) || props.action.childManagerAccountID;
     const assigneeLogin = lodashGet(props.personalDetailsList, [taskAssigneeAccountID, 'login'], '');
     const assigneeDisplayName = lodashGet(props.personalDetailsList, [taskAssigneeAccountID, 'displayName'], '');
-    const taskAssignee = assigneeLogin || assigneeDisplayName;
+    const taskAssignee = assigneeDisplayName || LocalePhoneNumber.formatPhoneNumber(assigneeLogin);
     const htmlForTaskPreview = taskAssignee ? `<comment><mention-user>@${taskAssignee}</mention-user> ${taskTitle}</comment>` : `<comment>${taskTitle}</comment>`;
+    const isDeletedParentAction = ReportUtils.isCanceledTaskReport(props.taskReport, props.action);
+
+    if (isDeletedParentAction) {
+        return <RenderHTML html={`<comment>${props.translate('parentReportAction.deletedTask')}</comment>`} />;
+    }
 
     return (
         <View style={[styles.chatItemMessage]}>
             <PressableWithoutFeedback
-                onPress={() => Navigation.navigate(ROUTES.getReportRoute(props.taskReportID))}
+                onPress={() => Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(props.taskReportID))}
                 style={[styles.flexRow, styles.justifyContentBetween]}
                 accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
                 accessibilityLabel={props.translate('task.task')}
@@ -89,9 +95,9 @@ function TaskPreview(props) {
                         disabled={ReportUtils.isCanceledTaskReport(props.taskReport)}
                         onPress={Session.checkIfActionIsAllowed(() => {
                             if (isTaskCompleted) {
-                                Task.reopenTask(props.taskReport, taskTitle);
+                                Task.reopenTask(props.taskReport);
                             } else {
-                                Task.completeTask(props.taskReport, taskTitle);
+                                Task.completeTask(props.taskReport);
                             }
                         })}
                         accessibilityLabel={props.translate('task.task')}
@@ -116,9 +122,11 @@ export default compose(
     withOnyx({
         taskReport: {
             key: ({taskReportID}) => `${ONYXKEYS.COLLECTION.REPORT}${taskReportID}`,
+            initialValue: {},
         },
         personalDetailsList: {
             key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+            initialValue: {},
         },
     }),
 )(TaskPreview);
diff --git a/src/components/ReportActionItem/TaskView.js b/src/components/ReportActionItem/TaskView.js
index 965c3120d51b..c52427ae1e8d 100644
--- a/src/components/ReportActionItem/TaskView.js
+++ b/src/components/ReportActionItem/TaskView.js
@@ -27,6 +27,7 @@ import getButtonState from '../../libs/getButtonState';
 import PressableWithSecondaryInteraction from '../PressableWithSecondaryInteraction';
 import * as Session from '../../libs/actions/Session';
 import * as Expensicons from '../Icon/Expensicons';
+import SpacerView from '../SpacerView';
 
 const propTypes = {
     /** The report currently being looked at */
@@ -50,7 +51,8 @@ function TaskView(props) {
     const isOpen = ReportUtils.isOpenTaskReport(props.report);
     const isCanceled = ReportUtils.isCanceledTaskReport(props.report);
     const canModifyTask = Task.canModifyTask(props.report, props.currentUserPersonalDetails.accountID);
-    const disableState = !canModifyTask || !isOpen;
+    const disableState = !canModifyTask || isCanceled;
+    const isDisableInteractive = !canModifyTask || !isOpen;
     return (
         <View>
             <OfflineWithFeedback
@@ -63,13 +65,21 @@ function TaskView(props) {
                     {(hovered) => (
                         <PressableWithSecondaryInteraction
                             onPress={Session.checkIfActionIsAllowed((e) => {
+                                if (isDisableInteractive) {
+                                    return;
+                                }
                                 if (e && e.type === 'click') {
                                     e.currentTarget.blur();
                                 }
 
-                                Navigation.navigate(ROUTES.getTaskReportTitleRoute(props.report.reportID));
+                                Navigation.navigate(ROUTES.TASK_TITLE.getRoute(props.report.reportID));
                             })}
-                            style={({pressed}) => [styles.ph5, styles.pv2, StyleUtils.getButtonBackgroundColorStyle(getButtonState(hovered, pressed, false, disableState), true)]}
+                            style={({pressed}) => [
+                                styles.ph5,
+                                styles.pv2,
+                                StyleUtils.getButtonBackgroundColorStyle(getButtonState(hovered, pressed, false, disableState, !isDisableInteractive), true),
+                                isDisableInteractive && !disableState && styles.cursorDefault,
+                            ]}
                             ref={props.forwardedRef}
                             disabled={disableState}
                             accessibilityLabel={taskTitle || props.translate('task.task')}
@@ -81,9 +91,9 @@ function TaskView(props) {
                                         <Checkbox
                                             onPress={Session.checkIfActionIsAllowed(() => {
                                                 if (isCompleted) {
-                                                    Task.reopenTask(props.report, taskTitle);
+                                                    Task.reopenTask(props.report);
                                                 } else {
-                                                    Task.completeTask(props.report, taskTitle);
+                                                    Task.completeTask(props.report);
                                                 }
                                             })}
                                             isChecked={isCompleted}
@@ -119,14 +129,16 @@ function TaskView(props) {
                 </Hoverable>
                 <OfflineWithFeedback pendingAction={lodashGet(props, 'report.pendingFields.description')}>
                     <MenuItemWithTopDescription
+                        shouldParseTitle
                         description={props.translate('task.description')}
                         title={props.report.description || ''}
-                        onPress={() => Navigation.navigate(ROUTES.getTaskReportDescriptionRoute(props.report.reportID))}
+                        onPress={() => Navigation.navigate(ROUTES.TASK_DESCRIPTION.getRoute(props.report.reportID))}
                         shouldShowRightIcon={isOpen}
                         disabled={disableState}
                         wrapperStyle={[styles.pv2, styles.taskDescriptionMenuItem]}
                         shouldGreyOutWhenDisabled={false}
                         numberOfLinesTitle={0}
+                        interactive={!isDisableInteractive}
                     />
                 </OfflineWithFeedback>
                 {props.report.managerID ? (
@@ -138,26 +150,31 @@ function TaskView(props) {
                             iconType={CONST.ICON_TYPE_AVATAR}
                             avatarSize={CONST.AVATAR_SIZE.SMALLER}
                             titleStyle={styles.assigneeTextStyle}
-                            onPress={() => Navigation.navigate(ROUTES.getTaskReportAssigneeRoute(props.report.reportID))}
+                            onPress={() => Navigation.navigate(ROUTES.TASK_ASSIGNEE.getRoute(props.report.reportID))}
                             shouldShowRightIcon={isOpen}
                             disabled={disableState}
                             wrapperStyle={[styles.pv2]}
                             isSmallAvatarSubscriptMenu
                             shouldGreyOutWhenDisabled={false}
+                            interactive={!isDisableInteractive}
                         />
                     </OfflineWithFeedback>
                 ) : (
                     <MenuItemWithTopDescription
                         description={props.translate('task.assignee')}
-                        onPress={() => Navigation.navigate(ROUTES.getTaskReportAssigneeRoute(props.report.reportID))}
+                        onPress={() => Navigation.navigate(ROUTES.TASK_ASSIGNEE.getRoute(props.report.reportID))}
                         shouldShowRightIcon={isOpen}
                         disabled={disableState}
                         wrapperStyle={[styles.pv2]}
                         shouldGreyOutWhenDisabled={false}
+                        interactive={!isDisableInteractive}
                     />
                 )}
             </OfflineWithFeedback>
-            {props.shouldShowHorizontalRule && <View style={styles.reportHorizontalRule} />}
+            <SpacerView
+                shouldShow={props.shouldShowHorizontalRule}
+                style={[props.shouldShowHorizontalRule ? styles.reportHorizontalRule : {}]}
+            />
         </View>
     );
 }
diff --git a/src/components/ReportActionsSkeletonView/SkeletonViewLines.js b/src/components/ReportActionsSkeletonView/SkeletonViewLines.js
index f87ae176e3ac..e4432ceb2309 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
@@ -31,20 +31,20 @@ function SkeletonViewLines(props) {
                 r="20"
             />
             <Rect
-                x="67"
+                x="72"
                 y="11"
                 width="20%"
                 height="8"
             />
             <Rect
-                x="67"
+                x="72"
                 y="31"
                 width="100%"
                 height="8"
             />
             {props.numberOfRows > 1 && (
                 <Rect
-                    x="67"
+                    x="72"
                     y="51"
                     width="50%"
                     height="8"
@@ -52,7 +52,7 @@ function SkeletonViewLines(props) {
             )}
             {props.numberOfRows > 2 && (
                 <Rect
-                    x="67"
+                    x="72"
                     y="71"
                     width="50%"
                     height="8"
diff --git a/src/components/ReportActionsSkeletonView/index.js b/src/components/ReportActionsSkeletonView/index.js
index 2fe7e590afef..6bdc993c2055 100644
--- a/src/components/ReportActionsSkeletonView/index.js
+++ b/src/components/ReportActionsSkeletonView/index.js
@@ -1,13 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import {View} from 'react-native';
+import {View, Dimensions} from 'react-native';
 import SkeletonViewLines from './SkeletonViewLines';
 import CONST from '../../CONST';
 
 const propTypes = {
-    /** Height of the container component */
-    containerHeight: PropTypes.number.isRequired,
-
     /** Whether to animate the skeleton view */
     shouldAnimate: PropTypes.bool,
 };
@@ -18,7 +15,7 @@ const defaultProps = {
 
 function ReportActionsSkeletonView(props) {
     // Determines the number of content items based on container height
-    const possibleVisibleContentItems = Math.ceil(props.containerHeight / CONST.CHAT_SKELETON_VIEW.AVERAGE_ROW_HEIGHT);
+    const possibleVisibleContentItems = Math.ceil(Dimensions.get('window').height / CONST.CHAT_SKELETON_VIEW.AVERAGE_ROW_HEIGHT);
     const skeletonViewLines = [];
     for (let index = 0; index < possibleVisibleContentItems; index++) {
         const iconIndex = (index + 1) % 4;
diff --git a/src/components/ReportWelcomeText.js b/src/components/ReportWelcomeText.js
index 80c26b5d6b3f..071e53de1776 100644
--- a/src/components/ReportWelcomeText.js
+++ b/src/components/ReportWelcomeText.js
@@ -102,7 +102,7 @@ function ReportWelcomeText(props) {
                         {roomWelcomeMessage.showReportName && (
                             <Text
                                 style={[styles.textStrong]}
-                                onPress={() => Navigation.navigate(ROUTES.getReportDetailsRoute(props.report.reportID))}
+                                onPress={() => Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(props.report.reportID))}
                                 suppressHighlighting
                             >
                                 {ReportUtils.getReportName(props.report)}
@@ -122,7 +122,7 @@ function ReportWelcomeText(props) {
                                     ) : (
                                         <Text
                                             style={[styles.textStrong]}
-                                            onPress={() => Navigation.navigate(ROUTES.getProfileRoute(accountID))}
+                                            onPress={() => Navigation.navigate(ROUTES.PROFILE.getRoute(accountID))}
                                             suppressHighlighting
                                         >
                                             {displayName}
diff --git a/src/components/RoomHeaderAvatars.js b/src/components/RoomHeaderAvatars.js
index af594dc2415a..92f294f056c7 100644
--- a/src/components/RoomHeaderAvatars.js
+++ b/src/components/RoomHeaderAvatars.js
@@ -49,6 +49,7 @@ function RoomHeaderAvatars(props) {
                             size={CONST.AVATAR_SIZE.LARGE}
                             name={props.icons[0].name}
                             type={props.icons[0].type}
+                            fallbackIcon={props.icons[0].fallbackIcon}
                         />
                     </PressableWithoutFocus>
                 )}
@@ -93,6 +94,7 @@ function RoomHeaderAvatars(props) {
                                         containerStyles={[...iconStyle, StyleUtils.getAvatarBorderRadius(CONST.AVATAR_SIZE.LARGE_BORDERED, icon.type)]}
                                         name={icon.name}
                                         type={icon.type}
+                                        fallbackIcon={icon.fallbackIcon}
                                     />
                                 </PressableWithoutFocus>
                             )}
diff --git a/src/components/RoomNameInput/index.js b/src/components/RoomNameInput/index.js
index 14b369d86a4c..4546e83ef769 100644
--- a/src/components/RoomNameInput/index.js
+++ b/src/components/RoomNameInput/index.js
@@ -6,7 +6,7 @@ import useLocalize from '../../hooks/useLocalize';
 import * as roomNameInputPropTypes from './roomNameInputPropTypes';
 import * as RoomNameInputUtils from '../../libs/RoomNameInputUtils';
 
-function RoomNameInput({autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange}) {
+function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange, shouldDelayFocus}) {
     const {translate} = useLocalize();
 
     const [selection, setSelection] = useState();
@@ -57,8 +57,9 @@ function RoomNameInput({autoFocus, disabled, errorText, forwardedRef, value, onB
             onSelectionChange={(event) => setSelection(event.nativeEvent.selection)}
             errorText={errorText}
             autoCapitalize="none"
-            onBlur={onBlur}
-            autoFocus={autoFocus}
+            onBlur={() => isFocused && onBlur()}
+            shouldDelayFocus={shouldDelayFocus}
+            autoFocus={isFocused && autoFocus}
             maxLength={CONST.REPORT.MAX_ROOM_NAME_LENGTH}
             spellCheck={false}
         />
diff --git a/src/components/RoomNameInput/index.native.js b/src/components/RoomNameInput/index.native.js
index e263321dea0e..78500a8f0be2 100644
--- a/src/components/RoomNameInput/index.native.js
+++ b/src/components/RoomNameInput/index.native.js
@@ -7,7 +7,7 @@ import * as roomNameInputPropTypes from './roomNameInputPropTypes';
 import * as RoomNameInputUtils from '../../libs/RoomNameInputUtils';
 import getOperatingSystem from '../../libs/getOperatingSystem';
 
-function RoomNameInput({autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange, shouldDelayFocus}) {
+function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange, shouldDelayFocus}) {
     const {translate} = useLocalize();
 
     /**
@@ -41,8 +41,8 @@ function RoomNameInput({autoFocus, disabled, errorText, forwardedRef, value, onB
             errorText={errorText}
             maxLength={CONST.REPORT.MAX_ROOM_NAME_LENGTH}
             keyboardType={keyboardType} // this is a bit hacky solution to a RN issue https://github.com/facebook/react-native/issues/27449
-            onBlur={onBlur}
-            autoFocus={autoFocus}
+            onBlur={() => isFocused && onBlur()}
+            autoFocus={isFocused && autoFocus}
             autoCapitalize="none"
             shouldDelayFocus={shouldDelayFocus}
         />
diff --git a/src/components/RoomNameInput/roomNameInputPropTypes.js b/src/components/RoomNameInput/roomNameInputPropTypes.js
index 3eef833a1252..ab1ac37d32c8 100644
--- a/src/components/RoomNameInput/roomNameInputPropTypes.js
+++ b/src/components/RoomNameInput/roomNameInputPropTypes.js
@@ -1,4 +1,5 @@
 import PropTypes from 'prop-types';
+import {withNavigationFocusPropTypes} from '../withNavigationFocus';
 
 const propTypes = {
     /** Callback to execute when the text input is modified correctly */
@@ -27,6 +28,8 @@ const propTypes = {
 
     /** Whether we should wait before focusing the TextInput, useful when using transitions on Android */
     shouldDelayFocus: PropTypes.bool,
+
+    ...withNavigationFocusPropTypes,
 };
 
 const defaultProps = {
diff --git a/src/components/ScreenWrapper/index.js b/src/components/ScreenWrapper/index.js
index f760e5d5aeb4..1cad1e96b26d 100644
--- a/src/components/ScreenWrapper/index.js
+++ b/src/components/ScreenWrapper/index.js
@@ -109,6 +109,7 @@ class ScreenWrapper extends React.Component {
                             style={styles.flex1}
                             // eslint-disable-next-line react/jsx-props-no-spreading
                             {...(this.props.environment === CONST.ENVIRONMENT.DEV ? this.panResponder.panHandlers : {})}
+                            testID={this.props.testID}
                         >
                             <View
                                 style={[styles.flex1, paddingStyle, ...this.props.style]}
diff --git a/src/components/ScreenWrapper/propTypes.js b/src/components/ScreenWrapper/propTypes.js
index 83033d9e97b7..9434402cc20f 100644
--- a/src/components/ScreenWrapper/propTypes.js
+++ b/src/components/ScreenWrapper/propTypes.js
@@ -10,6 +10,9 @@ const propTypes = {
     /** Returns a function as a child to pass insets to or a node to render without insets */
     children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]).isRequired,
 
+    /** A unique ID to find the screen wrapper in tests */
+    testID: PropTypes.string.isRequired,
+
     /** Whether to include padding bottom */
     includeSafeAreaPaddingBottom: PropTypes.bool,
 
diff --git a/src/components/SelectionList/BaseSelectionList.js b/src/components/SelectionList/BaseSelectionList.js
index 046b64e9e5c0..8d894e4c983a 100644
--- a/src/components/SelectionList/BaseSelectionList.js
+++ b/src/components/SelectionList/BaseSelectionList.js
@@ -1,7 +1,8 @@
-import React, {useEffect, useMemo, useRef, useState} from 'react';
+import React, {useCallback, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
+import {useFocusEffect, useIsFocused} from '@react-navigation/native';
 import SectionList from '../SectionList';
 import Text from '../Text';
 import styles from '../../styles/styles';
@@ -11,7 +12,7 @@ import CONST from '../../CONST';
 import variables from '../../styles/variables';
 import {propTypes as selectionListPropTypes} from './selectionListPropTypes';
 import RadioListItem from './RadioListItem';
-import CheckboxListItem from './CheckboxListItem';
+import UserListItem from './UserListItem';
 import useKeyboardShortcut from '../../hooks/useKeyboardShortcut';
 import SafeAreaConsumer from '../SafeAreaConsumer';
 import withKeyboardState, {keyboardStatePropTypes} from '../withKeyboardState';
@@ -42,7 +43,6 @@ function BaseSelectionList({
     keyboardType = CONST.KEYBOARD_TYPE.DEFAULT,
     onChangeText,
     initiallyFocusedOptionKey = '',
-    shouldDelayFocus = false,
     onScroll,
     onScrollBeginDrag,
     headerMessage = '',
@@ -61,6 +61,7 @@ function BaseSelectionList({
     const shouldShowTextInput = Boolean(textInputLabel);
     const shouldShowSelectAll = Boolean(onSelectAll);
     const activeElement = useActiveElement();
+    const isFocused = useIsFocused();
 
     /**
      * Iterates through the sections and items inside each section, and builds 3 arrays along the way:
@@ -135,6 +136,9 @@ function BaseSelectionList({
         };
     }, [canSelectMultiple, sections]);
 
+    // Disable `Enter` hotkey if the active element is a button or checkbox
+    const shouldDisableHotkeys = activeElement && [CONST.ACCESSIBILITY_ROLE.BUTTON, CONST.ACCESSIBILITY_ROLE.CHECKBOX].includes(activeElement.role);
+
     // If `initiallyFocusedOptionKey` is not passed, we fall back to `-1`, to avoid showing the highlight on the first member
     const [focusedIndex, setFocusedIndex] = useState(() => _.findIndex(flattenedSections.allOptions, (option) => option.keyForList === initiallyFocusedOptionKey));
 
@@ -167,23 +171,35 @@ function BaseSelectionList({
         listRef.current.scrollToLocation({sectionIndex: adjustedSectionIndex, itemIndex, animated, viewOffset: variables.contentHeaderHeight});
     };
 
-    const selectRow = (item, index) => {
+    /**
+     * Logic to run when a row is selected, either with click/press or keyboard hotkeys.
+     *
+     * @param {Object} item - the list item
+     * @param {Boolean} shouldUnfocusRow - flag to decide if we should unfocus all rows. True when selecting a row with click or press (not keyboard)
+     */
+    const selectRow = (item, shouldUnfocusRow = false) => {
         // In single-selection lists we don't care about updating the focused index, because the list is closed after selecting an item
         if (canSelectMultiple) {
-            if (sections.length === 1) {
-                // If the list has only 1 section (e.g. Workspace Members list), we always focus the next available item
-                const nextAvailableIndex = _.findIndex(flattenedSections.allOptions, (option, i) => i > index && !option.isDisabled);
-                setFocusedIndex(nextAvailableIndex);
-            } else {
-                // If the list has multiple sections (e.g. Workspace Invite list), we focus the first one after all the selected (selected items are always at the top)
+            if (sections.length > 1) {
+                // If the list has only 1 section (e.g. Workspace Members list), we do nothing.
+                // If the list has multiple sections (e.g. Workspace Invite list), and `shouldUnfocusRow` is false,
+                // we focus the first one after all the selected (selected items are always at the top).
                 const selectedOptionsCount = item.isSelected ? flattenedSections.selectedOptions.length - 1 : flattenedSections.selectedOptions.length + 1;
-                setFocusedIndex(selectedOptionsCount);
+
+                if (!shouldUnfocusRow) {
+                    setFocusedIndex(selectedOptionsCount);
+                }
 
                 if (!item.isSelected) {
                     // If we're selecting an item, scroll to it's position at the top, so we can see it
                     scrollToIndex(Math.max(selectedOptionsCount - 1, 0), true);
                 }
             }
+
+            if (shouldUnfocusRow) {
+                // Unfocus all rows when selecting row with click/press
+                setFocusedIndex(-1);
+            }
         }
 
         onSelectRow(item);
@@ -196,7 +212,7 @@ function BaseSelectionList({
             return;
         }
 
-        selectRow(focusedOption, focusedIndex);
+        selectRow(focusedOption);
     };
 
     /**
@@ -242,16 +258,20 @@ function BaseSelectionList({
     };
 
     const renderItem = ({item, index, section}) => {
+        const normalizedIndex = index + lodashGet(section, 'indexOffset', 0);
         const isDisabled = section.isDisabled;
-        const isFocused = !isDisabled && focusedIndex === index + lodashGet(section, 'indexOffset', 0);
+        const isItemFocused = !isDisabled && focusedIndex === normalizedIndex;
+        // We only create tooltips for the first 10 users or so since some reports have hundreds of users, causing performance to degrade.
+        const showTooltip = normalizedIndex < 10;
 
         if (canSelectMultiple) {
             return (
-                <CheckboxListItem
+                <UserListItem
                     item={item}
-                    isFocused={isFocused}
-                    onSelectRow={() => selectRow(item, index)}
+                    isFocused={isItemFocused}
+                    onSelectRow={() => selectRow(item, true)}
                     onDismissError={onDismissError}
+                    showTooltip={showTooltip}
                 />
             );
         }
@@ -259,43 +279,40 @@ function BaseSelectionList({
         return (
             <RadioListItem
                 item={item}
-                isFocused={isFocused}
+                isFocused={isItemFocused}
                 isDisabled={isDisabled}
-                onSelectRow={() => selectRow(item, index)}
+                onSelectRow={() => selectRow(item, true)}
             />
         );
     };
 
-    /** Focuses the text input when the component mounts. If `props.shouldDelayFocus` is true, we wait for the animation to finish */
-    useEffect(() => {
-        if (shouldShowTextInput) {
-            if (shouldDelayFocus) {
+    /** Focuses the text input when the component comes into focus and after any navigation animations finish. */
+    useFocusEffect(
+        useCallback(() => {
+            if (shouldShowTextInput) {
                 focusTimeoutRef.current = setTimeout(() => textInputRef.current.focus(), CONST.ANIMATED_TRANSITION);
-            } else {
-                textInputRef.current.focus();
-            }
-        }
-
-        return () => {
-            if (!focusTimeoutRef.current) {
-                return;
             }
-            clearTimeout(focusTimeoutRef.current);
-        };
-    }, [shouldDelayFocus, shouldShowTextInput]);
+            return () => {
+                if (!focusTimeoutRef.current) {
+                    return;
+                }
+                clearTimeout(focusTimeoutRef.current);
+            };
+        }, [shouldShowTextInput]),
+    );
 
     /** Selects row when pressing Enter */
     useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.ENTER, selectFocusedOption, {
         captureOnInputs: true,
         shouldBubble: () => !flattenedSections.allOptions[focusedIndex],
-        isActive: !activeElement,
+        isActive: !shouldDisableHotkeys && isFocused,
     });
 
     /** Calls confirm action when pressing CTRL (CMD) + Enter */
     useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.CTRL_ENTER, onConfirm, {
         captureOnInputs: true,
         shouldBubble: () => !flattenedSections.allOptions[focusedIndex],
-        isActive: Boolean(onConfirm),
+        isActive: Boolean(onConfirm) && isFocused,
     });
 
     return (
@@ -346,6 +363,7 @@ function BaseSelectionList({
                                         accessibilityRole="button"
                                         accessibilityState={{checked: flattenedSections.allSelected}}
                                         disabled={flattenedSections.allOptions.length === flattenedSections.disabledOptionsIndexes.length}
+                                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                                     >
                                         <Checkbox
                                             accessibilityLabel={translate('workspace.people.selectAll')}
@@ -354,13 +372,14 @@ 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>
                                 )}
                                 <SectionList
                                     ref={listRef}
                                     sections={sections}
+                                    stickySectionHeadersEnabled={false}
                                     renderSectionHeader={renderSectionHeader}
                                     renderItem={renderItem}
                                     getItemLayout={getItemLayout}
diff --git a/src/components/SelectionList/CheckboxListItem.js b/src/components/SelectionList/CheckboxListItem.js
deleted file mode 100644
index 256182a38e8b..000000000000
--- a/src/components/SelectionList/CheckboxListItem.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import React from 'react';
-import {View} from 'react-native';
-import _ from 'underscore';
-import lodashGet from 'lodash/get';
-import PressableWithFeedback from '../Pressable/PressableWithFeedback';
-import styles from '../../styles/styles';
-import Text from '../Text';
-import {checkboxListItemPropTypes} from './selectionListPropTypes';
-import Avatar from '../Avatar';
-import OfflineWithFeedback from '../OfflineWithFeedback';
-import CONST from '../../CONST';
-import * as StyleUtils from '../../styles/StyleUtils';
-import Icon from '../Icon';
-import * as Expensicons from '../Icon/Expensicons';
-import themeColors from '../../styles/themes/default';
-
-function CheckboxListItem({item, isFocused = false, onSelectRow, onDismissError = () => {}}) {
-    const hasError = !_.isEmpty(item.errors);
-
-    return (
-        <OfflineWithFeedback
-            onClose={() => onDismissError(item)}
-            pendingAction={item.pendingAction}
-            errors={item.errors}
-            errorRowStyles={styles.ph5}
-        >
-            <PressableWithFeedback
-                style={[styles.peopleRow, styles.userSelectNone, isFocused && styles.sidebarLinkActive, hasError && styles.borderColorDanger]}
-                onPress={() => onSelectRow(item)}
-                disabled={item.isDisabled}
-                accessibilityLabel={item.text}
-                accessibilityRole="checkbox"
-                accessibilityState={{checked: item.isSelected}}
-                hoverDimmingValue={1}
-                hoverStyle={styles.hoveredComponentBG}
-                focusStyle={styles.hoveredComponentBG}
-            >
-                <View
-                    style={[
-                        StyleUtils.getCheckboxContainerStyle(20, 4),
-                        item.isSelected && styles.checkedContainer,
-                        item.isSelected && styles.borderColorFocus,
-                        item.isDisabled && styles.cursorDisabled,
-                        item.isDisabled && styles.buttonOpacityDisabled,
-                    ]}
-                >
-                    {item.isSelected && (
-                        <Icon
-                            src={Expensicons.Checkmark}
-                            fill={themeColors.textLight}
-                            height={14}
-                            width={14}
-                        />
-                    )}
-                </View>
-                {Boolean(item.avatar) && (
-                    <Avatar
-                        containerStyles={styles.pl5}
-                        source={lodashGet(item, 'avatar.source', '')}
-                        name={lodashGet(item, 'avatar.name', item.text)}
-                        type={lodashGet(item, 'avatar.type', CONST.ICON_TYPE_AVATAR)}
-                    />
-                )}
-                <View style={[styles.flex1, styles.flexColumn, styles.justifyContentCenter, styles.alignItemsStart, styles.pl3, styles.optionRow]}>
-                    <Text
-                        style={[styles.optionDisplayName, isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, styles.sidebarLinkTextBold]}
-                        numberOfLines={1}
-                    >
-                        {item.text}
-                    </Text>
-                    {Boolean(item.alternateText) && (
-                        <Text
-                            style={[isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting]}
-                            numberOfLines={1}
-                        >
-                            {item.alternateText}
-                        </Text>
-                    )}
-                </View>
-                {Boolean(item.rightElement) && item.rightElement}
-            </PressableWithFeedback>
-        </OfflineWithFeedback>
-    );
-}
-
-CheckboxListItem.displayName = 'CheckboxListItem';
-CheckboxListItem.propTypes = checkboxListItemPropTypes;
-
-export default CheckboxListItem;
diff --git a/src/components/SelectionList/RadioListItem.js b/src/components/SelectionList/RadioListItem.js
index 92e3e84b66c8..530af66d91d3 100644
--- a/src/components/SelectionList/RadioListItem.js
+++ b/src/components/SelectionList/RadioListItem.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import {View} from 'react-native';
+import CONST from '../../CONST';
 import PressableWithFeedback from '../Pressable/PressableWithFeedback';
 import styles from '../../styles/styles';
 import Text from '../Text';
@@ -17,7 +18,7 @@ function RadioListItem({item, isFocused = false, isDisabled = false, onSelectRow
             accessibilityRole="button"
             hoverDimmingValue={1}
             hoverStyle={styles.hoveredComponentBG}
-            focusStyle={styles.hoveredComponentBG}
+            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
         >
             <View style={[styles.flex1, styles.justifyContentBetween, styles.sidebarLinkInner, styles.optionRow, styles.userSelectNone, isFocused && styles.sidebarLinkActive]}>
                 <View style={[styles.flex1, styles.alignItemsStart]}>
diff --git a/src/components/SelectionList/UserListItem.js b/src/components/SelectionList/UserListItem.js
new file mode 100644
index 000000000000..0d37162a7995
--- /dev/null
+++ b/src/components/SelectionList/UserListItem.js
@@ -0,0 +1,112 @@
+import React from 'react';
+import {View} from 'react-native';
+import _ from 'underscore';
+import lodashGet from 'lodash/get';
+import PressableWithFeedback from '../Pressable/PressableWithFeedback';
+import styles from '../../styles/styles';
+import Text from '../Text';
+import {userListItemPropTypes} from './selectionListPropTypes';
+import Avatar from '../Avatar';
+import OfflineWithFeedback from '../OfflineWithFeedback';
+import CONST from '../../CONST';
+import * as StyleUtils from '../../styles/StyleUtils';
+import Icon from '../Icon';
+import * as Expensicons from '../Icon/Expensicons';
+import themeColors from '../../styles/themes/default';
+import Tooltip from '../Tooltip';
+import UserDetailsTooltip from '../UserDetailsTooltip';
+
+function UserListItem({item, isFocused = false, showTooltip, onSelectRow, onDismissError = () => {}}) {
+    const hasError = !_.isEmpty(item.errors);
+
+    const avatar = (
+        <Avatar
+            containerStyles={styles.pl3}
+            source={lodashGet(item, 'avatar.source', '')}
+            name={lodashGet(item, 'avatar.name', item.text)}
+            type={lodashGet(item, 'avatar.type', CONST.ICON_TYPE_AVATAR)}
+            fallbackIcon={lodashGet(item, 'avatar.fallbackIcon')}
+        />
+    );
+
+    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}
+                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+            >
+                <View style={styles.checkboxPressable}>
+                    <View
+                        style={[
+                            StyleUtils.getCheckboxContainerStyle(20, 4),
+                            item.isSelected && styles.checkedContainer,
+                            item.isSelected && styles.borderColorFocus,
+                            item.isDisabled && styles.cursorDisabled,
+                            item.isDisabled && styles.buttonOpacityDisabled,
+                        ]}
+                    >
+                        {item.isSelected && (
+                            <Icon
+                                src={Expensicons.Checkmark}
+                                fill={themeColors.textLight}
+                                height={14}
+                                width={14}
+                            />
+                        )}
+                    </View>
+                </View>
+                {Boolean(item.avatar) &&
+                    (showTooltip ? (
+                        <UserDetailsTooltip
+                            accountID={item.accountID}
+                            shiftHorizontal={styles.pl3.paddingLeft / 2}
+                        >
+                            <View>{avatar}</View>
+                        </UserDetailsTooltip>
+                    ) : (
+                        avatar
+                    ))}
+                <View style={[styles.flex1, styles.flexColumn, styles.justifyContentCenter, styles.alignItemsStart, styles.pl3, styles.optionRow]}>
+                    {showTooltip ? <Tooltip text={item.text}>{text}</Tooltip> : text}
+                    {Boolean(item.alternateText) && (showTooltip ? <Tooltip text={item.alternateText}>{alternateText}</Tooltip> : alternateText)}
+                </View>
+                {Boolean(item.rightElement) && item.rightElement}
+            </PressableWithFeedback>
+        </OfflineWithFeedback>
+    );
+}
+
+UserListItem.displayName = 'UserListItem';
+UserListItem.propTypes = userListItemPropTypes;
+
+export default UserListItem;
diff --git a/src/components/SelectionList/selectionListPropTypes.js b/src/components/SelectionList/selectionListPropTypes.js
index 9adf42833ebc..0a3c1efdf6a3 100644
--- a/src/components/SelectionList/selectionListPropTypes.js
+++ b/src/components/SelectionList/selectionListPropTypes.js
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import _ from 'underscore';
 import CONST from '../../CONST';
 
-const checkboxListItemPropTypes = {
+const userListItemPropTypes = {
     /** The section list item */
     item: PropTypes.shape({
         /** Text to display */
@@ -46,6 +46,9 @@ const checkboxListItemPropTypes = {
     /** Whether this item is focused (for arrow key controls) */
     isFocused: PropTypes.bool,
 
+    /** Whether this item should show Tooltip */
+    showTooltip: PropTypes.bool.isRequired,
+
     /** Callback to fire when the item is pressed */
     onSelectRow: PropTypes.func.isRequired,
 
@@ -90,7 +93,7 @@ const propTypes = {
             indexOffset: PropTypes.number,
 
             /** Array of options */
-            data: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.shape(checkboxListItemPropTypes.item), PropTypes.shape(radioListItemPropTypes.item)])),
+            data: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.shape(userListItemPropTypes.item), PropTypes.shape(radioListItemPropTypes.item)])),
 
             /** Whether this section items disabled for selection */
             isDisabled: PropTypes.bool,
@@ -130,9 +133,6 @@ const propTypes = {
     /** Item `keyForList` to focus initially */
     initiallyFocusedOptionKey: PropTypes.string,
 
-    /** Whether to delay focus on the text input when mounting. Used for a smoother animation on Android */
-    shouldDelayFocus: PropTypes.bool,
-
     /** Callback to fire when the list is scrolled */
     onScroll: PropTypes.func,
 
@@ -158,4 +158,4 @@ const propTypes = {
     showConfirmButton: PropTypes.bool,
 };
 
-export {propTypes, radioListItemPropTypes, checkboxListItemPropTypes};
+export {propTypes, radioListItemPropTypes, userListItemPropTypes};
diff --git a/src/components/SettlementButton.js b/src/components/SettlementButton.js
index 21af004a0683..088b296b343a 100644
--- a/src/components/SettlementButton.js
+++ b/src/components/SettlementButton.js
@@ -1,21 +1,20 @@
+import React, {useEffect, useMemo} from 'react';
 import _ from 'underscore';
-import React from 'react';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
-import ButtonWithDropdownMenu from './ButtonWithDropdownMenu';
-import * as Expensicons from './Icon/Expensicons';
-import Permissions from '../libs/Permissions';
-import ONYXKEYS from '../ONYXKEYS';
 import CONST from '../CONST';
+import ONYXKEYS from '../ONYXKEYS';
 import compose from '../libs/compose';
-import withLocalize, {withLocalizePropTypes} from './withLocalize';
+import Permissions from '../libs/Permissions';
+import useNetwork from '../hooks/useNetwork';
+import useLocalize from '../hooks/useLocalize';
+import * as ReportUtils from '../libs/ReportUtils';
+import iouReportPropTypes from '../pages/iouReportPropTypes';
 import * as PaymentMethods from '../libs/actions/PaymentMethods';
 import KYCWall from './KYCWall';
 import withNavigation from './withNavigation';
-import {withNetwork} from './OnyxProvider';
-import networkPropTypes from './networkPropTypes';
-import iouReportPropTypes from '../pages/iouReportPropTypes';
-import * as ReportUtils from '../libs/ReportUtils';
+import * as Expensicons from './Icon/Expensicons';
+import ButtonWithDropdownMenu from './ButtonWithDropdownMenu';
 
 const propTypes = {
     /** Callback to execute when this button is pressed. Receives a single payment type argument. */
@@ -24,12 +23,6 @@ const propTypes = {
     /** Settlement currency type */
     currency: PropTypes.string,
 
-    /** Should we show paypal option */
-    shouldShowPaypal: PropTypes.bool,
-
-    /** Information about the network */
-    network: networkPropTypes.isRequired,
-
     /** When the button is opened via an IOU, ID for the chatReport that the IOU is linked to */
     chatReportID: PropTypes.string,
 
@@ -60,25 +53,40 @@ const propTypes = {
     /** The size of button size */
     buttonSize: PropTypes.oneOf(_.values(CONST.DROPDOWN_BUTTON_SIZE)),
 
-    /** The anchor alignment of the popover menu */
+    /** Route for the Add Bank Account screen for a given navigation stack */
+    addBankAccountRoute: PropTypes.string,
+
+    /** Route for the Add Debit Card screen for a given navigation stack */
+    addDebitCardRoute: PropTypes.string,
+
+    /** Whether the button should be disabled */
+    isDisabled: PropTypes.bool,
+
+    /** Whether we should show a loading state for the main button */
+    isLoading: PropTypes.bool,
 
+    /** The anchor alignment of the popover menu */
     anchorAlignment: PropTypes.shape({
         horizontal: PropTypes.oneOf(_.values(CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL)),
         vertical: PropTypes.oneOf(_.values(CONST.MODAL.ANCHOR_ORIGIN_VERTICAL)),
     }),
-
-    ...withLocalizePropTypes,
 };
 
 const defaultProps = {
+    isLoading: false,
+    isDisabled: false,
+    addBankAccountRoute: '',
+    addDebitCardRoute: '',
     currency: CONST.CURRENCY.USD,
-    shouldShowPaypal: false,
     chatReportID: '',
-    betas: [],
+
+    // The "betas" array, "iouReport" and "nvp_lastPaymentMethod" objects needs to be stable to prevent the "useMemo"
+    // hook from being recreated unnecessarily, hence the use of CONST.EMPTY_ARRAY and CONST.EMPTY_OBJECT
+    betas: CONST.EMPTY_ARRAY,
+    iouReport: CONST.EMPTY_OBJECT,
+    nvp_lastPaymentMethod: CONST.EMPTY_OBJECT,
     shouldShowPaymentOptions: false,
-    nvp_lastPaymentMethod: {},
     style: [],
-    iouReport: {},
     policyID: '',
     formattedAmount: '',
     buttonSize: CONST.DROPDOWN_BUTTON_SIZE.MEDIUM,
@@ -88,43 +96,58 @@ const defaultProps = {
     },
 };
 
-class SettlementButton extends React.Component {
-    componentDidMount() {
+function SettlementButton({
+    addDebitCardRoute,
+    addBankAccountRoute,
+    anchorAlignment,
+    betas,
+    buttonSize,
+    chatReportID,
+    currency,
+    enablePaymentsRoute,
+    iouReport,
+    isDisabled,
+    isLoading,
+    formattedAmount,
+    nvp_lastPaymentMethod,
+    onPress,
+    policyID,
+    shouldShowPaymentOptions,
+    style,
+}) {
+    const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
+
+    useEffect(() => {
         PaymentMethods.openWalletPage();
-    }
+    }, []);
 
-    getButtonOptionsFromProps() {
+    const paymentButtonOptions = useMemo(() => {
         const buttonOptions = [];
-        const isExpenseReport = ReportUtils.isExpenseReport(this.props.iouReport);
+        const isExpenseReport = ReportUtils.isExpenseReport(iouReport);
         const paymentMethods = {
             [CONST.IOU.PAYMENT_TYPE.EXPENSIFY]: {
-                text: this.props.translate('iou.settleExpensify', {formattedAmount: this.props.formattedAmount || ''}),
+                text: translate('iou.settleExpensify', {formattedAmount}),
                 icon: Expensicons.Wallet,
                 value: CONST.IOU.PAYMENT_TYPE.EXPENSIFY,
             },
             [CONST.IOU.PAYMENT_TYPE.VBBA]: {
-                text: this.props.translate('iou.settleExpensify', {formattedAmount: this.props.formattedAmount || ''}),
+                text: translate('iou.settleExpensify', {formattedAmount}),
                 icon: Expensicons.Wallet,
                 value: CONST.IOU.PAYMENT_TYPE.VBBA,
             },
-            [CONST.IOU.PAYMENT_TYPE.PAYPAL_ME]: {
-                text: this.props.translate('iou.settlePaypalMe', {formattedAmount: this.props.formattedAmount || ''}),
-                icon: Expensicons.PayPal,
-                value: CONST.IOU.PAYMENT_TYPE.PAYPAL_ME,
-            },
             [CONST.IOU.PAYMENT_TYPE.ELSEWHERE]: {
-                text: this.props.translate('iou.payElsewhere'),
+                text: translate('iou.payElsewhere'),
                 icon: Expensicons.Cash,
                 value: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
             },
         };
-        const canUseWallet =
-            !isExpenseReport && this.props.currency === CONST.CURRENCY.USD && Permissions.canUsePayWithExpensify(this.props.betas) && Permissions.canUseWallet(this.props.betas);
+        const canUseWallet = !isExpenseReport && currency === CONST.CURRENCY.USD && Permissions.canUsePayWithExpensify(betas) && Permissions.canUseWallet(betas);
 
         // To achieve the one tap pay experience we need to choose the correct payment type as default,
         // if user already paid for some request or expense, let's use the last payment method or use default.
-        let paymentMethod = this.props.nvp_lastPaymentMethod[this.props.policyID] || '';
-        if (!this.props.shouldShowPaymentOptions) {
+        let paymentMethod = nvp_lastPaymentMethod[policyID] || '';
+        if (!shouldShowPaymentOptions) {
             if (!paymentMethod) {
                 // In case the user hasn't paid a request yet, let's default to VBBA payment type in case of expense reports
                 if (isExpenseReport) {
@@ -137,16 +160,11 @@ class SettlementButton extends React.Component {
                 }
             }
 
-            // In case the last payment method has been PayPal, but this request is made in currency unsupported by Paypal, default to Elsewhere
-            if (paymentMethod === CONST.IOU.PAYMENT_TYPE.PAYPAL_ME && !_.includes(CONST.PAYPAL_SUPPORTED_CURRENCIES, this.props.currency)) {
-                paymentMethod = CONST.IOU.PAYMENT_TYPE.ELSEWHERE;
-            }
-
             // In case of the settlement button in the report preview component, we do not show payment options and the label for Wallet and ACH type is simply "Pay".
             return [
                 {
                     ...paymentMethods[paymentMethod],
-                    text: paymentMethod === CONST.IOU.PAYMENT_TYPE.ELSEWHERE ? this.props.translate('iou.payElsewhere') : this.props.translate('iou.pay'),
+                    text: paymentMethod === CONST.IOU.PAYMENT_TYPE.ELSEWHERE ? translate('iou.payElsewhere') : translate('iou.pay'),
                 },
             ];
         }
@@ -156,9 +174,6 @@ class SettlementButton extends React.Component {
         if (isExpenseReport) {
             buttonOptions.push(paymentMethods[CONST.IOU.PAYMENT_TYPE.VBBA]);
         }
-        if (this.props.shouldShowPaypal && _.includes(CONST.PAYPAL_SUPPORTED_CURRENCIES, this.props.currency)) {
-            buttonOptions.push(paymentMethods[CONST.IOU.PAYMENT_TYPE.PAYPAL_ME]);
-        }
         buttonOptions.push(paymentMethods[CONST.IOU.PAYMENT_TYPE.ELSEWHERE]);
 
         // Put the preferred payment method to the front of the array so its shown as default
@@ -166,50 +181,49 @@ class SettlementButton extends React.Component {
             return _.sortBy(buttonOptions, (method) => (method.value === paymentMethod ? 0 : 1));
         }
         return buttonOptions;
-    }
-
-    render() {
-        return (
-            <KYCWall
-                onSuccessfulKYC={(iouPaymentType) => this.props.onPress(iouPaymentType)}
-                enablePaymentsRoute={this.props.enablePaymentsRoute}
-                addBankAccountRoute={this.props.addBankAccountRoute}
-                addDebitCardRoute={this.props.addDebitCardRoute}
-                isDisabled={this.props.network.isOffline}
-                chatReportID={this.props.chatReportID}
-                iouReport={this.props.iouReport}
-            >
-                {(triggerKYCFlow, buttonRef) => (
-                    <ButtonWithDropdownMenu
-                        buttonRef={buttonRef}
-                        isDisabled={this.props.isDisabled}
-                        isLoading={this.props.isLoading}
-                        onPress={(event, iouPaymentType) => {
-                            if (iouPaymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY || iouPaymentType === CONST.IOU.PAYMENT_TYPE.VBBA) {
-                                triggerKYCFlow(event, iouPaymentType);
-                                return;
-                            }
-
-                            this.props.onPress(iouPaymentType);
-                        }}
-                        options={this.getButtonOptionsFromProps()}
-                        style={this.props.style}
-                        buttonSize={this.props.buttonSize}
-                        anchorAlignment={this.props.anchorAlignment}
-                    />
-                )}
-            </KYCWall>
-        );
-    }
+    }, [betas, currency, formattedAmount, iouReport, nvp_lastPaymentMethod, policyID, shouldShowPaymentOptions, translate]);
+
+    const selectPaymentType = (event, iouPaymentType, triggerKYCFlow) => {
+        if (iouPaymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY || iouPaymentType === CONST.IOU.PAYMENT_TYPE.VBBA) {
+            triggerKYCFlow(event, iouPaymentType);
+            return;
+        }
+
+        onPress(iouPaymentType);
+    };
+
+    return (
+        <KYCWall
+            onSuccessfulKYC={onPress}
+            enablePaymentsRoute={enablePaymentsRoute}
+            addBankAccountRoute={addBankAccountRoute}
+            addDebitCardRoute={addDebitCardRoute}
+            isDisabled={isOffline}
+            chatReportID={chatReportID}
+            iouReport={iouReport}
+        >
+            {(triggerKYCFlow, buttonRef) => (
+                <ButtonWithDropdownMenu
+                    buttonRef={buttonRef}
+                    isDisabled={isDisabled}
+                    isLoading={isLoading}
+                    onPress={(event, iouPaymentType) => selectPaymentType(event, iouPaymentType, triggerKYCFlow)}
+                    options={paymentButtonOptions}
+                    style={style}
+                    buttonSize={buttonSize}
+                    anchorAlignment={anchorAlignment}
+                />
+            )}
+        </KYCWall>
+    );
 }
 
 SettlementButton.propTypes = propTypes;
 SettlementButton.defaultProps = defaultProps;
+SettlementButton.displayName = 'SettlementButton';
 
 export default compose(
     withNavigation,
-    withLocalize,
-    withNetwork(),
     withOnyx({
         betas: {
             key: ONYXKEYS.BETAS,
diff --git a/src/components/ShowContextMenuContext.js b/src/components/ShowContextMenuContext.js
index df522dec8f10..fff233162d74 100644
--- a/src/components/ShowContextMenuContext.js
+++ b/src/components/ShowContextMenuContext.js
@@ -2,6 +2,7 @@ import React from 'react';
 import * as ReportActionContextMenu from '../pages/home/report/ContextMenu/ReportActionContextMenu';
 import * as ContextMenuActions from '../pages/home/report/ContextMenu/ContextMenuActions';
 import * as DeviceCapabilities from '../libs/DeviceCapabilities';
+import * as ReportUtils from '../libs/ReportUtils';
 
 const ShowContextMenuContext = React.createContext({
     anchor: null,
@@ -32,7 +33,8 @@ function showContextMenuForReport(event, anchor, reportID, action, checkIfContex
         '',
         anchor,
         reportID,
-        action,
+        action.reportActionID,
+        ReportUtils.getOriginalReportID(reportID, action),
         '',
         checkIfContextMenuActive,
         checkIfContextMenuActive,
diff --git a/src/components/SignInButtons/AppleSignIn/index.android.js b/src/components/SignInButtons/AppleSignIn/index.android.js
index 83a99683b178..48d2bf3cc861 100644
--- a/src/components/SignInButtons/AppleSignIn/index.android.js
+++ b/src/components/SignInButtons/AppleSignIn/index.android.js
@@ -39,7 +39,9 @@ function AppleSignIn() {
         appleSignInRequest()
             .then((token) => Session.beginAppleSignIn(token))
             .catch((e) => {
-                if (e.message === appleAuthAndroid.Error.SIGNIN_CANCELLED) return null;
+                if (e.message === appleAuthAndroid.Error.SIGNIN_CANCELLED) {
+                    return null;
+                }
                 Log.alert('[Apple Sign In] Apple authentication failed', e);
             });
     };
diff --git a/src/components/SignInButtons/AppleSignIn/index.desktop.js b/src/components/SignInButtons/AppleSignIn/index.desktop.js
index 425e88ddf930..52ff3ef710b0 100644
--- a/src/components/SignInButtons/AppleSignIn/index.desktop.js
+++ b/src/components/SignInButtons/AppleSignIn/index.desktop.js
@@ -14,7 +14,7 @@ const appleSignInWebRouteForDesktopFlow = `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}
  */
 function AppleSignIn() {
     return (
-        <View style={styles.appleButtonContainer}>
+        <View style={styles.desktopSignInButtonContainer}>
             <IconButton
                 onPress={() => {
                     window.open(appleSignInWebRouteForDesktopFlow);
diff --git a/src/components/SignInButtons/AppleSignIn/index.ios.js b/src/components/SignInButtons/AppleSignIn/index.ios.js
index 681eebb298c5..0c9a8c9e8211 100644
--- a/src/components/SignInButtons/AppleSignIn/index.ios.js
+++ b/src/components/SignInButtons/AppleSignIn/index.ios.js
@@ -37,7 +37,9 @@ function AppleSignIn() {
         appleSignInRequest()
             .then((token) => Session.beginAppleSignIn(token))
             .catch((e) => {
-                if (e.code === appleAuth.Error.CANCELED) return null;
+                if (e.code === appleAuth.Error.CANCELED) {
+                    return null;
+                }
                 Log.alert('[Apple Sign In] Apple authentication failed', e);
             });
     };
diff --git a/src/components/SignInButtons/AppleSignIn/index.website.js b/src/components/SignInButtons/AppleSignIn/index.website.js
index 41c8f2afd4d5..7046de5068b1 100644
--- a/src/components/SignInButtons/AppleSignIn/index.website.js
+++ b/src/components/SignInButtons/AppleSignIn/index.website.js
@@ -55,7 +55,9 @@ const successListener = (event) => {
 };
 
 const failureListener = (event) => {
-    if (!event.detail || event.detail.error === 'popup_closed_by_user') return null;
+    if (!event.detail || event.detail.error === 'popup_closed_by_user') {
+        return null;
+    }
     Log.warn(`Apple sign-in failed: ${event.detail}`);
 };
 
@@ -126,7 +128,9 @@ const SingletonAppleSignInButtonWithFocus = withNavigationFocus(SingletonAppleSi
 function AppleSignIn({isDesktopFlow}) {
     const [scriptLoaded, setScriptLoaded] = useState(false);
     useEffect(() => {
-        if (window.appleAuthScriptLoaded) return;
+        if (window.appleAuthScriptLoaded) {
+            return;
+        }
 
         const localeCode = getUserLanguage();
         const script = document.createElement('script');
diff --git a/src/components/SignInButtons/GoogleSignIn/index.desktop.js b/src/components/SignInButtons/GoogleSignIn/index.desktop.js
index bdba2052d664..95a78f34614b 100644
--- a/src/components/SignInButtons/GoogleSignIn/index.desktop.js
+++ b/src/components/SignInButtons/GoogleSignIn/index.desktop.js
@@ -17,7 +17,7 @@ const googleSignInWebRouteForDesktopFlow = `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL
  */
 function GoogleSignIn() {
     return (
-        <View style={styles.appleButtonContainer}>
+        <View style={styles.desktopSignInButtonContainer}>
             <IconButton
                 onPress={() => {
                     window.open(googleSignInWebRouteForDesktopFlow);
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/SpacerView.js b/src/components/SpacerView.js
new file mode 100644
index 000000000000..3b81bbfa0dc5
--- /dev/null
+++ b/src/components/SpacerView.js
@@ -0,0 +1,49 @@
+import React from 'react';
+import Animated, {useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated';
+import PropTypes from 'prop-types';
+import * as StyleUtils from '../styles/StyleUtils';
+import stylePropTypes from '../styles/stylePropTypes';
+import CONST from '../CONST';
+
+const propTypes = {
+    /**
+     * Should we show the spacer
+     */
+    shouldShow: PropTypes.bool.isRequired,
+
+    /**
+     * Array of style objects
+     * @default []
+     */
+    style: stylePropTypes,
+};
+
+const defaultProps = {
+    style: [],
+};
+
+function SpacerView({shouldShow = true, style = []}) {
+    const marginVertical = useSharedValue(CONST.HORIZONTAL_SPACER.DEFAULT_MARGIN_VERTICAL);
+    const borderBottomWidth = useSharedValue(CONST.HORIZONTAL_SPACER.DEFAULT_BORDER_BOTTOM_WIDTH);
+    const animatedStyles = useAnimatedStyle(() => ({
+        marginVertical: marginVertical.value,
+        borderBottomWidth: borderBottomWidth.value,
+    }));
+
+    React.useEffect(() => {
+        const duration = CONST.ANIMATED_TRANSITION;
+        const values = {
+            marginVertical: shouldShow ? CONST.HORIZONTAL_SPACER.DEFAULT_MARGIN_VERTICAL : CONST.HORIZONTAL_SPACER.HIDDEN_MARGIN_VERTICAL,
+            borderBottomWidth: shouldShow ? CONST.HORIZONTAL_SPACER.DEFAULT_BORDER_BOTTOM_WIDTH : CONST.HORIZONTAL_SPACER.HIDDEN_BORDER_BOTTOM_WIDTH,
+        };
+        marginVertical.value = withTiming(values.marginVertical, {duration});
+        borderBottomWidth.value = withTiming(values.borderBottomWidth, {duration});
+    }, [shouldShow, borderBottomWidth, marginVertical]);
+
+    return <Animated.View style={[animatedStyles, ...StyleUtils.parseStyleAsArray(style)]} />;
+}
+
+SpacerView.displayName = 'SpacerView';
+SpacerView.propTypes = propTypes;
+SpacerView.defaultProps = defaultProps;
+export default SpacerView;
diff --git a/src/components/StatePicker/StateSelectorModal.js b/src/components/StatePicker/StateSelectorModal.js
index c7cbd5be9e31..378dcc4ebc8b 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],
     );
 
@@ -79,6 +84,7 @@ function StateSelectorModal({currentState, isVisible, onClose, onStateSelected,
                 style={[styles.pb0]}
                 includePaddingTop={false}
                 includeSafeAreaPaddingBottom={false}
+                testID={StateSelectorModal.displayName}
             >
                 <HeaderWithBackButton
                     title={label || translate('common.state')}
@@ -92,7 +98,6 @@ function StateSelectorModal({currentState, isVisible, onClose, onStateSelected,
                     sections={[{data: searchResults, indexOffset: 0}]}
                     onSelectRow={onStateSelected}
                     onChangeText={setSearchValue}
-                    shouldDelayFocus
                     initiallyFocusedOptionKey={currentState}
                 />
             </ScreenWrapper>
diff --git a/src/components/StatePicker/index.js b/src/components/StatePicker/index.js
index a4d3ea5e8133..f7f894af2a07 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('');
 
@@ -48,11 +49,13 @@ function StatePicker({value, errorText, onInputChange, forwardedRef, label}) {
     };
 
     const updateStateInput = (state) => {
-        onInputChange(state.value);
+        if (state.value !== value) {
+            onInputChange(state.value);
+        }
         hidePickerModal();
     };
 
-    const title = allStates[value] ? allStates[value].stateName : '';
+    const title = value && _.keys(COMMON_CONST.STATES).includes(value) ? translate(`allStates.${value}.stateName`) : '';
     const descStyle = title.length === 0 ? styles.textNormal : null;
 
     return (
diff --git a/src/components/SubscriptAvatar.js b/src/components/SubscriptAvatar.js
index 038484e3f42d..81864d6e5af2 100644
--- a/src/components/SubscriptAvatar.js
+++ b/src/components/SubscriptAvatar.js
@@ -60,6 +60,7 @@ function SubscriptAvatar(props) {
                         size={props.size || CONST.AVATAR_SIZE.DEFAULT}
                         name={props.mainAvatar.name}
                         type={props.mainAvatar.type}
+                        fallbackIcon={props.mainAvatar.fallbackIcon}
                     />
                 </View>
             </UserDetailsTooltip>
@@ -83,6 +84,7 @@ function SubscriptAvatar(props) {
                         fill={themeColors.iconSuccessFill}
                         name={props.secondaryAvatar.name}
                         type={props.secondaryAvatar.type}
+                        fallbackIcon={props.secondaryAvatar.fallbackIcon}
                     />
                 </View>
             </UserDetailsTooltip>
diff --git a/src/components/Switch.js b/src/components/Switch.js
index 3b7f464b00e5..5c8a0da925f3 100644
--- a/src/components/Switch.js
+++ b/src/components/Switch.js
@@ -4,6 +4,7 @@ import {Animated} from 'react-native';
 import CONST from '../CONST';
 import styles from '../styles/styles';
 import PressableWithFeedback from './Pressable/PressableWithFeedback';
+import useNativeDriver from '../libs/useNativeDriver';
 
 const propTypes = {
     /** Whether the switch is toggled to the on position */
@@ -28,7 +29,7 @@ function Switch(props) {
         Animated.timing(offsetX.current, {
             toValue: props.isOn ? OFFSET_X.ON : OFFSET_X.OFF,
             duration: 300,
-            useNativeDriver: true,
+            useNativeDriver,
         }).start();
     }, [props.isOn]);
 
diff --git a/src/components/TabSelector/TabSelector.js b/src/components/TabSelector/TabSelector.js
index e1f8927bcb9b..79cd1a6dd17d 100644
--- a/src/components/TabSelector/TabSelector.js
+++ b/src/components/TabSelector/TabSelector.js
@@ -36,25 +36,20 @@ const defaultProps = {
     },
 };
 
-const getIcon = (route) => {
+const getIconAndTitle = (route, translate) => {
     switch (route) {
+        case CONST.TAB.MANUAL:
+            return {icon: Expensicons.Pencil, title: translate('tabSelector.manual')};
         case CONST.TAB.SCAN:
-            return Expensicons.Receipt;
+            return {icon: Expensicons.Receipt, title: translate('tabSelector.scan')};
+        case CONST.TAB.NEW_CHAT:
+            return {icon: Expensicons.User, title: translate('tabSelector.chat')};
+        case CONST.TAB.NEW_ROOM:
+            return {icon: Expensicons.Hashtag, title: translate('tabSelector.room')};
         case CONST.TAB.DISTANCE:
-            return Expensicons.Car;
+            return {icon: Expensicons.Car, title: translate('common.distance')};
         default:
-            return Expensicons.Pencil;
-    }
-};
-
-const getTitle = (route, translate) => {
-    switch (route) {
-        case CONST.TAB.SCAN:
-            return translate('tabSelector.scan');
-        case CONST.TAB.DISTANCE:
-            return translate('common.distance');
-        default:
-            return translate('tabSelector.manual');
+            throw new Error(`Route ${route} has no icon nor title set.`);
     }
 };
 
@@ -79,10 +74,10 @@ const getBackgroundColor = (position, routesLength, tabIndex) => {
 
         return position.interpolate({
             inputRange,
-            outputRange: _.map(inputRange, (i) => (i === tabIndex ? themeColors.midtone : themeColors.appBG)),
+            outputRange: _.map(inputRange, (i) => (i === tabIndex ? themeColors.border : themeColors.appBG)),
         });
     }
-    return themeColors.midtone;
+    return themeColors.border;
 };
 
 function TabSelector({state, navigation, onTabPress, position}) {
@@ -94,8 +89,8 @@ function TabSelector({state, navigation, onTabPress, position}) {
                 const activeOpacity = getOpacity(position, state.routes.length, index, true);
                 const inactiveOpacity = getOpacity(position, state.routes.length, index, false);
                 const backgroundColor = getBackgroundColor(position, state.routes.length, index);
-
                 const isFocused = index === state.index;
+                const {icon, title} = getIconAndTitle(route.name, translate);
 
                 const onPress = () => {
                     if (isFocused) {
@@ -119,8 +114,8 @@ function TabSelector({state, navigation, onTabPress, position}) {
                 return (
                     <TabSelectorItem
                         key={route.name}
-                        title={getTitle(route.name, translate)}
-                        icon={getIcon(route.name)}
+                        icon={icon}
+                        title={title}
                         onPress={onPress}
                         activeOpacity={activeOpacity}
                         inactiveOpacity={inactiveOpacity}
diff --git a/src/components/TagPicker/index.js b/src/components/TagPicker/index.js
new file mode 100644
index 000000000000..8e7cf11f7e5a
--- /dev/null
+++ b/src/components/TagPicker/index.js
@@ -0,0 +1,88 @@
+import React, {useMemo, useState} from 'react';
+import _ from 'underscore';
+import lodashGet from 'lodash/get';
+import {withOnyx} from 'react-native-onyx';
+import CONST from '../../CONST';
+import ONYXKEYS from '../../ONYXKEYS';
+import styles from '../../styles/styles';
+import useLocalize from '../../hooks/useLocalize';
+import * as OptionsListUtils from '../../libs/OptionsListUtils';
+import * as PolicyUtils from '../../libs/PolicyUtils';
+import OptionsSelector from '../OptionsSelector';
+import {propTypes, defaultProps} from './tagPickerPropTypes';
+
+function TagPicker({selectedTag, tag, policyTags, policyRecentlyUsedTags, onSubmit}) {
+    const {translate} = useLocalize();
+    const [searchValue, setSearchValue] = useState('');
+
+    const policyRecentlyUsedTagsList = lodashGet(policyRecentlyUsedTags, tag, []);
+    const policyTagList = PolicyUtils.getTagList(policyTags, tag);
+    const policyTagsCount = _.size(_.filter(policyTagList, (policyTag) => policyTag.enabled));
+    const isTagsCountBelowThreshold = policyTagsCount < CONST.TAG_LIST_THRESHOLD;
+
+    const shouldShowTextInput = !isTagsCountBelowThreshold;
+
+    const selectedOptions = useMemo(() => {
+        if (!selectedTag) {
+            return [];
+        }
+
+        return [
+            {
+                name: selectedTag,
+                enabled: true,
+                accountID: null,
+            },
+        ];
+    }, [selectedTag]);
+
+    const initialFocusedIndex = useMemo(() => {
+        if (isTagsCountBelowThreshold && selectedOptions.length > 0) {
+            return _.chain(policyTagList)
+                .values()
+                .findIndex((policyTag) => policyTag.name === selectedOptions[0].name, true)
+                .value();
+        }
+
+        return 0;
+    }, [policyTagList, selectedOptions, isTagsCountBelowThreshold]);
+
+    const sections = useMemo(
+        () =>
+            OptionsListUtils.getFilteredOptions({}, {}, [], searchValue, selectedOptions, [], false, false, false, {}, [], true, policyTagList, policyRecentlyUsedTagsList, false).tagOptions,
+        [searchValue, selectedOptions, policyTagList, policyRecentlyUsedTagsList],
+    );
+
+    const headerMessage = OptionsListUtils.getHeaderMessage(lodashGet(sections, '[0].data.length', 0) > 0, false, '');
+
+    return (
+        <OptionsSelector
+            optionHoveredStyle={styles.hoveredComponentBG}
+            sections={sections}
+            selectedOptions={selectedOptions}
+            headerMessage={headerMessage}
+            textInputLabel={translate('common.search')}
+            boldStyle
+            highlightSelectedOptions
+            isRowMultilineSupported
+            shouldShowTextInput={shouldShowTextInput}
+            value={searchValue}
+            initialFocusedIndex={initialFocusedIndex}
+            onChangeText={setSearchValue}
+            onSelectRow={onSubmit}
+        />
+    );
+}
+
+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}`,
+    },
+})(TagPicker);
diff --git a/src/components/TagPicker/tagPickerPropTypes.js b/src/components/TagPicker/tagPickerPropTypes.js
new file mode 100644
index 000000000000..011885fe0f81
--- /dev/null
+++ b/src/components/TagPicker/tagPickerPropTypes.js
@@ -0,0 +1,30 @@
+import PropTypes from 'prop-types';
+import tagPropTypes from '../tagPropTypes';
+
+const propTypes = {
+    /** The policyID we are getting tags for */
+    policyID: PropTypes.string.isRequired,
+
+    /** The selected tag of the money request */
+    selectedTag: PropTypes.string.isRequired,
+
+    /** The name of tag list we are getting tags for */
+    tag: PropTypes.string.isRequired,
+
+    /** Callback to submit the selected tag */
+    onSubmit: PropTypes.func.isRequired,
+
+    /* Onyx Props */
+    /** Collection of tags attached to a policy */
+    policyTags: tagPropTypes,
+
+    /** List of recently used tags */
+    policyRecentlyUsedTags: PropTypes.objectOf(PropTypes.arrayOf(PropTypes.string)),
+};
+
+const defaultProps = {
+    policyTags: {},
+    policyRecentlyUsedTags: {},
+};
+
+export {propTypes, defaultProps};
diff --git a/src/components/TaskHeaderActionButton.js b/src/components/TaskHeaderActionButton.js
index aa7694095f5b..b22b5c92bf70 100644
--- a/src/components/TaskHeaderActionButton.js
+++ b/src/components/TaskHeaderActionButton.js
@@ -36,10 +36,8 @@ function TaskHeaderActionButton(props) {
                 success
                 isDisabled={ReportUtils.isCanceledTaskReport(props.report) || !Task.canModifyTask(props.report, props.session.accountID)}
                 medium
-                text={props.translate(ReportUtils.isCompletedTaskReport(props.report) ? 'task.markAsIncomplete' : 'task.markAsDone')}
-                onPress={() =>
-                    ReportUtils.isCompletedTaskReport(props.report) ? Task.reopenTask(props.report, props.report.reportName) : Task.completeTask(props.report, props.report.reportName)
-                }
+                text={props.translate(ReportUtils.isCompletedTaskReport(props.report) ? 'task.markAsIncomplete' : 'task.markAsComplete')}
+                onPress={() => (ReportUtils.isCompletedTaskReport(props.report) ? Task.reopenTask(props.report) : Task.completeTask(props.report))}
                 style={[styles.flex1]}
             />
         </View>
diff --git a/src/components/TextInput/BaseTextInput.js b/src/components/TextInput/BaseTextInput.js
index 297d7de028fb..bd6548607cb9 100644
--- a/src/components/TextInput/BaseTextInput.js
+++ b/src/components/TextInput/BaseTextInput.js
@@ -1,6 +1,6 @@
 import _ from 'underscore';
-import React, {useState, useRef, useEffect, useCallback} from 'react';
-import {Animated, View, AppState, Keyboard, StyleSheet} from 'react-native';
+import React, {useState, useRef, useEffect, useCallback, useMemo} from 'react';
+import {Animated, View, StyleSheet} from 'react-native';
 import Str from 'expensify-common/lib/str';
 import RNTextInput from '../RNTextInput';
 import TextInputLabel from './TextInputLabel';
@@ -20,16 +20,17 @@ import FormHelpMessage from '../FormHelpMessage';
 import isInputAutoFilled from '../../libs/isInputAutoFilled';
 import PressableWithoutFeedback from '../Pressable/PressableWithoutFeedback';
 import withLocalize from '../withLocalize';
+import useNativeDriver from '../../libs/useNativeDriver';
+import * as Browser from '../../libs/Browser';
 
 function BaseTextInput(props) {
-    const inputValue = props.value || props.defaultValue || '';
-    const initialActiveLabel = props.forceActiveLabel || inputValue.length > 0 || Boolean(props.prefixCharacter);
+    const initialValue = props.value || props.defaultValue || '';
+    const initialActiveLabel = props.forceActiveLabel || initialValue.length > 0 || Boolean(props.prefixCharacter);
 
     const [isFocused, setIsFocused] = useState(false);
     const [passwordHidden, setPasswordHidden] = useState(props.secureTextEntry);
     const [textInputWidth, setTextInputWidth] = useState(0);
     const [textInputHeight, setTextInputHeight] = useState(0);
-    const [prefixWidth, setPrefixWidth] = useState(0);
     const [height, setHeight] = useState(variables.componentSizeLarge);
     const [width, setWidth] = useState();
     const labelScale = useRef(new Animated.Value(initialActiveLabel ? styleConst.ACTIVE_LABEL_SCALE : styleConst.INACTIVE_LABEL_SCALE)).current;
@@ -38,24 +39,6 @@ function BaseTextInput(props) {
     const input = useRef(null);
     const isLabelActive = useRef(initialActiveLabel);
 
-    useEffect(() => {
-        if (!props.disableKeyboard) {
-            return;
-        }
-
-        const appStateSubscription = AppState.addEventListener('change', (nextAppState) => {
-            if (!nextAppState.match(/inactive|background/)) {
-                return;
-            }
-
-            Keyboard.dismiss();
-        });
-
-        return () => {
-            appStateSubscription.remove();
-        };
-    }, [props.disableKeyboard]);
-
     // AutoFocus which only works on mount:
     useEffect(() => {
         // We are manually managing focus to prevent this issue: https://github.com/Expensify/App/issues/4514
@@ -86,12 +69,12 @@ function BaseTextInput(props) {
                 Animated.spring(labelTranslateY, {
                     toValue: translateY,
                     duration: styleConst.LABEL_ANIMATION_DURATION,
-                    useNativeDriver: true,
+                    useNativeDriver,
                 }),
                 Animated.spring(labelScale, {
                     toValue: scale,
                     duration: styleConst.LABEL_ANIMATION_DURATION,
-                    useNativeDriver: true,
+                    useNativeDriver,
                 }),
             ]).start();
         },
@@ -162,30 +145,16 @@ function BaseTextInput(props) {
         [props.autoGrowHeight, props.multiline],
     );
 
-    useEffect(() => {
-        // Handle side effects when the value gets changed programatically from the outside
-
-        // In some cases, When the value prop is empty, it is not properly updated on the TextInput due to its uncontrolled nature, thus manually clearing the TextInput.
-        if (inputValue === '') {
-            input.current.clear();
-        }
+    // The ref is needed when the component is uncontrolled and we don't have a value prop
+    const hasValueRef = useRef(initialValue.length > 0);
+    const inputValue = props.value || '';
+    const hasValue = inputValue.length > 0 || hasValueRef.current;
 
-        if (inputValue) {
-            activateLabel();
-        }
-    }, [activateLabel, inputValue]);
-
-    // We capture whether the input has a value or not in a ref.
-    // It gets updated when the text gets changed.
-    const hasValueRef = useRef(inputValue.length > 0);
-
-    // Activate or deactivate the label when the focus changes:
+    // Activate or deactivate the label when either focus changes, or for controlled
+    // components when the value prop changes:
     useEffect(() => {
-        // We can't use inputValue here directly, as it might contain
-        // the defaultValue, which doesn't get updated when the text changes.
-        // We can't use props.value either, as it might be undefined.
         if (
-            hasValueRef.current ||
+            hasValue ||
             isFocused ||
             // If the text has been supplied by Chrome autofill, the value state is not synced with the value
             // as Chrome doesn't trigger a change event. When there is autofill text, keep the label activated.
@@ -195,7 +164,16 @@ function BaseTextInput(props) {
         } else {
             deactivateLabel();
         }
-    }, [activateLabel, deactivateLabel, inputValue, isFocused]);
+    }, [activateLabel, deactivateLabel, hasValue, isFocused]);
+
+    // When the value prop gets cleared externally, we need to keep the ref in sync:
+    useEffect(() => {
+        // Return early when component uncontrolled, or we still have a value
+        if (props.value === undefined || !_.isEmpty(props.value)) {
+            return;
+        }
+        hasValueRef.current = false;
+    }, [props.value]);
 
     /**
      * Set Value & activateLabel
@@ -209,9 +187,13 @@ function BaseTextInput(props) {
         }
 
         Str.result(props.onChangeText, value);
+
         if (value && value.length > 0) {
             hasValueRef.current = true;
-            activateLabel();
+            // When the componment is uncontrolled, we need to manually activate the label:
+            if (props.value === undefined) {
+                activateLabel();
+            }
         } else {
             hasValueRef.current = false;
         }
@@ -221,9 +203,20 @@ function BaseTextInput(props) {
         setPasswordHidden((prevPasswordHidden) => !prevPasswordHidden);
     }, []);
 
-    const storePrefixLayoutDimensions = useCallback((event) => {
-        setPrefixWidth(Math.abs(event.nativeEvent.layout.width));
-    }, []);
+    // When adding a new prefix character, adjust this method to add expected character width.
+    // This is because character width isn't known before it's rendered to the screen, and once it's rendered,
+    // it's too late to calculate it's width because the change in padding would cause a visible jump.
+    // Some characters are wider than the others when rendered, e.g. '@' vs '#'. Chosen font-family and font-size
+    // also have an impact on the width of the character, but as long as there's only one font-family and one font-size,
+    // this method will produce reliable results.
+    const getCharacterPadding = (prefix) => {
+        switch (prefix) {
+            case CONST.POLICY.ROOM_PREFIX:
+                return 10;
+            default:
+                throw new Error(`Prefix ${prefix} has no padding assigned.`);
+        }
+    };
 
     // eslint-disable-next-line react/forbid-foreign-prop-types
     const inputProps = _.omit(props, _.keys(baseTextInputPropTypes.propTypes));
@@ -242,6 +235,25 @@ function BaseTextInput(props) {
     ]);
     const isMultiline = props.multiline || props.autoGrowHeight;
 
+    /* To prevent text jumping caused by virtual DOM calculations on Safari and mobile Chrome,
+    make sure to include the `lineHeight`.
+    Reference: https://github.com/Expensify/App/issues/26735
+
+    For other platforms, explicitly remove `lineHeight` from single-line inputs
+    to prevent long text from disappearing once it exceeds the input space.
+    See https://github.com/Expensify/App/issues/13802 */
+    const lineHeight = useMemo(() => {
+        if (Browser.isSafari() && _.isArray(props.inputStyle)) {
+            const lineHeightValue = _.find(props.inputStyle, (f) => f.lineHeight !== undefined);
+            if (lineHeightValue) {
+                return lineHeightValue.lineHeight;
+            }
+        } else if (Browser.isSafari() || Browser.isMobileChrome()) {
+            return height;
+        }
+        return undefined;
+    }, [props.inputStyle, height]);
+
     return (
         <>
             <View style={styles.pointerEventsNone}>
@@ -295,7 +307,7 @@ function BaseTextInput(props) {
                                         pointerEvents="none"
                                         selectable={false}
                                         style={[styles.textInputPrefix, !hasLabel && styles.pv0]}
-                                        onLayout={storePrefixLayoutDimensions}
+                                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                                     >
                                         {props.prefixCharacter}
                                     </Text>
@@ -322,15 +334,17 @@ function BaseTextInput(props) {
                                     styles.w100,
                                     props.inputStyle,
                                     (!hasLabel || isMultiline) && styles.pv0,
-                                    props.prefixCharacter && StyleUtils.getPaddingLeft(prefixWidth + styles.pl1.paddingLeft),
+                                    props.prefixCharacter && StyleUtils.getPaddingLeft(getCharacterPadding(props.prefixCharacter) + styles.pl1.paddingLeft),
                                     props.secureTextEntry && styles.secureInput,
 
                                     // Explicitly remove `lineHeight` from single line inputs so that long text doesn't disappear
                                     // once it exceeds the input space (See https://github.com/Expensify/App/issues/13802)
-                                    !isMultiline && {height, lineHeight: undefined},
+                                    !isMultiline && {height, lineHeight},
 
                                     // 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}
@@ -387,11 +401,17 @@ function BaseTextInput(props) {
                 This Text component is intentionally positioned out of the screen.
             */}
             {(props.autoGrow || props.autoGrowHeight) && (
-                // Add +2 to width so that the first digit of amount do not cut off on mWeb - https://github.com/Expensify/App/issues/8158.
+                // Add +2 to width on Safari browsers so that text is not cut off due to the cursor or when changing the value
+                // https://github.com/Expensify/App/issues/8158
+                // https://github.com/Expensify/App/issues/26628
                 <Text
                     style={[...props.inputStyle, props.autoGrowHeight && styles.autoGrowHeightHiddenInput(width, maxHeight), styles.hiddenElementOutsideOfWindow, styles.visibilityHidden]}
                     onLayout={(e) => {
-                        setTextInputWidth(e.nativeEvent.layout.width + 2);
+                        let additionalWidth = 0;
+                        if (Browser.isMobileSafari() || Browser.isSafari()) {
+                            additionalWidth = 2;
+                        }
+                        setTextInputWidth(e.nativeEvent.layout.width + additionalWidth);
                         setTextInputHeight(e.nativeEvent.layout.height);
                     }}
                 >
diff --git a/src/components/TextInput/index.js b/src/components/TextInput/index.js
index 48a92f081200..6cefe04e71a1 100644
--- a/src/components/TextInput/index.js
+++ b/src/components/TextInput/index.js
@@ -30,7 +30,9 @@ function TextInput(props) {
         });
 
         return () => {
-            if (!removeVisibilityListenerRef.current) return;
+            if (!removeVisibilityListenerRef.current) {
+                return;
+            }
             removeVisibilityListenerRef.current();
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/src/components/TextInput/index.native.js b/src/components/TextInput/index.native.js
index eb9970f2261f..059550855c0a 100644
--- a/src/components/TextInput/index.native.js
+++ b/src/components/TextInput/index.native.js
@@ -1,19 +1,40 @@
-import React, {forwardRef} from 'react';
+import React, {forwardRef, useEffect} from 'react';
+import {AppState, Keyboard} from 'react-native';
 import styles from '../../styles/styles';
 import BaseTextInput from './BaseTextInput';
 import * as baseTextInputPropTypes from './baseTextInputPropTypes';
 
-const TextInput = forwardRef((props, ref) => (
-    <BaseTextInput
-        // eslint-disable-next-line react/jsx-props-no-spreading
-        {...props}
-        // Setting autoCompleteType to new-password throws an error on Android/iOS, so fall back to password in that case
-        // eslint-disable-next-line react/jsx-props-no-multi-spaces
-        autoCompleteType={props.autoCompleteType === 'new-password' ? 'password' : props.autoCompleteType}
-        innerRef={ref}
-        inputStyle={[styles.baseTextInput, ...props.inputStyle]}
-    />
-));
+const TextInput = forwardRef((props, ref) => {
+    useEffect(() => {
+        if (!props.disableKeyboard) {
+            return;
+        }
+
+        const appStateSubscription = AppState.addEventListener('change', (nextAppState) => {
+            if (!nextAppState.match(/inactive|background/)) {
+                return;
+            }
+
+            Keyboard.dismiss();
+        });
+
+        return () => {
+            appStateSubscription.remove();
+        };
+    }, [props.disableKeyboard]);
+
+    return (
+        <BaseTextInput
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            // Setting autoCompleteType to new-password throws an error on Android/iOS, so fall back to password in that case
+            // eslint-disable-next-line react/jsx-props-no-multi-spaces
+            autoCompleteType={props.autoCompleteType === 'new-password' ? 'password' : props.autoCompleteType}
+            innerRef={ref}
+            inputStyle={[styles.baseTextInput, ...props.inputStyle]}
+        />
+    );
+});
 
 TextInput.propTypes = baseTextInputPropTypes.propTypes;
 TextInput.defaultProps = baseTextInputPropTypes.defaultProps;
diff --git a/src/components/ThreeDotsMenu/index.js b/src/components/ThreeDotsMenu/index.js
index b5637a4f3879..5e22a74fa37e 100644
--- a/src/components/ThreeDotsMenu/index.js
+++ b/src/components/ThreeDotsMenu/index.js
@@ -1,5 +1,5 @@
 import React, {useState, useRef} from 'react';
-import {View} from 'react-native';
+import {InteractionManager, View} from 'react-native';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
 import Icon from '../Icon';
@@ -45,6 +45,12 @@ const propTypes = {
         horizontal: PropTypes.oneOf(_.values(CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL)),
         vertical: PropTypes.oneOf(_.values(CONST.MODAL.ANCHOR_ORIGIN_VERTICAL)),
     }),
+
+    /** Function to call on modal hide */
+    onModalHide: PropTypes.func,
+
+    /** Whether the popover menu should overlay the current view */
+    shouldOverlay: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -57,9 +63,11 @@ const defaultProps = {
         horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
         vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP, // we assume that popover menu opens below the button, anchor is at TOP
     },
+    onModalHide: () => {},
+    shouldOverlay: false,
 };
 
-function ThreeDotsMenu({iconTooltip, icon, iconFill, iconStyles, onIconPress, menuItems, anchorPosition, anchorAlignment}) {
+function ThreeDotsMenu({iconTooltip, icon, iconFill, iconStyles, onIconPress, menuItems, anchorPosition, anchorAlignment, onModalHide, shouldOverlay}) {
     const [isPopupMenuVisible, setPopupMenuVisible] = useState(false);
     const buttonRef = useRef(null);
     const {translate} = useLocalize();
@@ -69,6 +77,9 @@ function ThreeDotsMenu({iconTooltip, icon, iconFill, iconStyles, onIconPress, me
     };
 
     const hidePopoverMenu = () => {
+        InteractionManager.runAfterInteractions(() => {
+            onModalHide();
+        });
         setPopupMenuVisible(false);
     };
 
@@ -101,12 +112,13 @@ function ThreeDotsMenu({iconTooltip, icon, iconFill, iconStyles, onIconPress, me
             </View>
             <PopoverMenu
                 onClose={hidePopoverMenu}
+                onPopoverHide={onModalHide}
                 isVisible={isPopupMenuVisible}
                 anchorPosition={anchorPosition}
                 anchorAlignment={anchorAlignment}
                 onItemSelected={hidePopoverMenu}
                 menuItems={menuItems}
-                withoutOverlay
+                withoutOverlay={!shouldOverlay}
                 anchorRef={buttonRef}
             />
         </>
diff --git a/src/components/Tooltip/TooltipRenderedOnPageBody.js b/src/components/Tooltip/TooltipRenderedOnPageBody.js
index c8624421f871..f61ecaee1059 100644
--- a/src/components/Tooltip/TooltipRenderedOnPageBody.js
+++ b/src/components/Tooltip/TooltipRenderedOnPageBody.js
@@ -86,6 +86,7 @@ function TooltipRenderedOnPageBody(props) {
     const {animationStyle, rootWrapperStyle, textStyle, pointerWrapperStyle, pointerStyle} = useMemo(
         () =>
             getTooltipStyles(
+                rootWrapper.current,
                 props.animation,
                 props.windowWidth,
                 props.xOffset,
@@ -97,7 +98,6 @@ function TooltipRenderedOnPageBody(props) {
                 wrapperMeasuredHeight,
                 props.shiftHorizontal,
                 props.shiftVertical,
-                rootWrapper.current,
             ),
         [
             props.animation,
diff --git a/src/components/Tooltip/index.js b/src/components/Tooltip/index.js
index 398df07649cf..f60982f52dd4 100644
--- a/src/components/Tooltip/index.js
+++ b/src/components/Tooltip/index.js
@@ -154,6 +154,7 @@ function Tooltip(props) {
                 <Hoverable
                     onHoverIn={showTooltip}
                     onHoverOut={hideTooltip}
+                    shouldHandleScroll={props.shouldHandleScroll}
                 >
                     {children}
                 </Hoverable>
diff --git a/src/components/Tooltip/tooltipPropTypes.js b/src/components/Tooltip/tooltipPropTypes.js
index af18c4cfa412..2ddf8120d58c 100644
--- a/src/components/Tooltip/tooltipPropTypes.js
+++ b/src/components/Tooltip/tooltipPropTypes.js
@@ -28,6 +28,9 @@ const propTypes = {
 
     /** Unique key of renderTooltipContent to rerender the tooltip when one of the key changes */
     renderTooltipContentKey: PropTypes.arrayOf(PropTypes.string),
+
+    /** passes this down to Hoverable component to decide whether to handle the scroll behaviour to show hover once the scroll ends */
+    shouldHandleScroll: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -38,6 +41,7 @@ const defaultProps = {
     numberOfLines: CONST.TOOLTIP_MAX_LINES,
     renderTooltipContent: undefined,
     renderTooltipContentKey: [],
+    shouldHandleScroll: false,
 };
 
 export {propTypes, defaultProps};
diff --git a/src/components/UnreadActionIndicator.js b/src/components/UnreadActionIndicator.js
index 5273ab52ec28..ff1090640570 100755
--- a/src/components/UnreadActionIndicator.js
+++ b/src/components/UnreadActionIndicator.js
@@ -10,6 +10,7 @@ function UnreadActionIndicator(props) {
         <View
             accessibilityLabel={props.translate('accessibilityHints.newMessageLineIndicator')}
             data-action-id={props.reportActionID}
+            pointerEvents="none"
             style={[styles.unreadIndicatorContainer, styles.userSelectNone]}
             dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
         >
diff --git a/src/components/UserDetailsTooltip/index.web.js b/src/components/UserDetailsTooltip/index.web.js
index 5fdae15184ac..e961c237ae5f 100644
--- a/src/components/UserDetailsTooltip/index.web.js
+++ b/src/components/UserDetailsTooltip/index.web.js
@@ -48,6 +48,7 @@ function UserDetailsTooltip(props) {
                         source={props.icon ? props.icon.source : UserUtils.getAvatar(userAvatar, userAccountID)}
                         type={props.icon ? props.icon.type : CONST.ICON_TYPE_AVATAR}
                         name={props.icon ? props.icon.name : userLogin}
+                        fallbackIcon={lodashGet(props.icon, 'fallbackIcon')}
                     />
                 </View>
                 <Text style={[styles.mt2, styles.textMicroBold, styles.textReactionSenders, styles.textAlignCenter]}>{title}</Text>
@@ -66,6 +67,7 @@ function UserDetailsTooltip(props) {
             shiftHorizontal={props.shiftHorizontal}
             renderTooltipContent={renderTooltipContent}
             renderTooltipContentKey={[userDisplayName, userLogin]}
+            shouldHandleScroll
         >
             {props.children}
         </Tooltip>
diff --git a/src/components/ValidateCode/ExpiredValidateCodeModal.js b/src/components/ValidateCode/ExpiredValidateCodeModal.js
index 449462e88130..e31e0772a8c5 100644
--- a/src/components/ValidateCode/ExpiredValidateCodeModal.js
+++ b/src/components/ValidateCode/ExpiredValidateCodeModal.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import {View} from 'react-native';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
 import styles from '../../styles/styles';
 import Icon from '../Icon';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
@@ -33,7 +33,7 @@ function ExpiredValidateCodeModal(props) {
                 <Icon
                     width={variables.modalWordmarkWidth}
                     height={variables.modalWordmarkHeight}
-                    fill={colors.green}
+                    fill={themeColors.success}
                     src={Expensicons.ExpensifyWordmark}
                 />
             </View>
diff --git a/src/components/ValidateCode/JustSignedInModal.js b/src/components/ValidateCode/JustSignedInModal.js
index 40b25e4a19e0..e96505470eba 100644
--- a/src/components/ValidateCode/JustSignedInModal.js
+++ b/src/components/ValidateCode/JustSignedInModal.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {View} from 'react-native';
-import colors from '../../styles/colors';
+import themeColors from '../../styles/themes/default';
 import styles from '../../styles/styles';
 import Icon from '../Icon';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
@@ -41,7 +41,7 @@ function JustSignedInModal(props) {
                 <Icon
                     width={variables.modalWordmarkWidth}
                     height={variables.modalWordmarkHeight}
-                    fill={colors.green}
+                    fill={themeColors.success}
                     src={Expensicons.ExpensifyWordmark}
                 />
             </View>
diff --git a/src/components/ValidateCode/ValidateCodeModal.js b/src/components/ValidateCode/ValidateCodeModal.js
index 344c3107b8cf..ceebc54a47af 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';
@@ -39,7 +39,7 @@ const defaultProps = {
 };
 
 function ValidateCodeModal(props) {
-    const signInHere = useCallback(() => Session.signInWithValidateCode(props.accountID, props.code, props.preferredLocale), [props.accountID, props.code, props.preferredLocale]);
+    const signInHere = useCallback(() => Session.signInWithValidateCode(props.accountID, props.code), [props.accountID, props.code]);
 
     return (
         <View style={styles.deeplinkWrapperContainer}>
@@ -71,7 +71,7 @@ function ValidateCodeModal(props) {
                 <Icon
                     width={variables.modalWordmarkWidth}
                     height={variables.modalWordmarkHeight}
-                    fill={colors.green}
+                    fill={themeColors.success}
                     src={Expensicons.ExpensifyWordmark}
                 />
             </View>
diff --git a/src/components/WalletStatementModal/index.js b/src/components/WalletStatementModal/index.js
index 8d7d000ad72d..b4d87bf4e0e4 100644
--- a/src/components/WalletStatementModal/index.js
+++ b/src/components/WalletStatementModal/index.js
@@ -12,6 +12,7 @@ import FullScreenLoadingIndicator from '../FullscreenLoadingIndicator';
 import ROUTES from '../../ROUTES';
 import Navigation from '../../libs/Navigation/Navigation';
 import * as Report from '../../libs/actions/Report';
+import CONST from '../../CONST';
 
 function WalletStatementModal({statementPageURL, session}) {
     const [isLoading, setIsLoading] = useState(true);
@@ -23,16 +24,16 @@ function WalletStatementModal({statementPageURL, session}) {
      * @param {MessageEvent} event
      */
     const navigate = (event) => {
-        if (!event.data || !event.data.type || (event.data.type !== 'STATEMENT_NAVIGATE' && event.data.type !== 'CONCIERGE_NAVIGATE')) {
+        if (!event.data || !event.data.type || (event.data.type !== CONST.WALLET.WEB_MESSAGE_TYPE.STATEMENT && event.data.type !== CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE)) {
             return;
         }
 
-        if (event.data.type === 'CONCIERGE_NAVIGATE') {
+        if (event.data.type === CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE) {
             Report.navigateToConciergeChat();
         }
 
-        if (event.data.type === 'STATEMENT_NAVIGATE' && event.data.url) {
-            const iouRoutes = [ROUTES.IOU_REQUEST, ROUTES.IOU_SEND, ROUTES.IOU_BILL];
+        if (event.data.type === CONST.WALLET.WEB_MESSAGE_TYPE.STATEMENT && event.data.url) {
+            const iouRoutes = [ROUTES.IOU_REQUEST, ROUTES.IOU_SEND];
             const navigateToIOURoute = _.find(iouRoutes, (iouRoute) => event.data.url.includes(iouRoute));
             if (navigateToIOURoute) {
                 Navigation.navigate(navigateToIOURoute);
diff --git a/src/components/WalletStatementModal/index.native.js b/src/components/WalletStatementModal/index.native.js
index 86737da158c8..38d1f90af00d 100644
--- a/src/components/WalletStatementModal/index.native.js
+++ b/src/components/WalletStatementModal/index.native.js
@@ -1,24 +1,22 @@
-import React from 'react';
+import React, {useCallback, useRef} from 'react';
 import {WebView} from 'react-native-webview';
 import lodashGet from 'lodash/get';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
-import withLocalize from '../withLocalize';
-import ONYXKEYS from '../../ONYXKEYS';
-import compose from '../../libs/compose';
 import {walletStatementPropTypes, walletStatementDefaultProps} from './WalletStatementModalPropTypes';
 import FullScreenLoadingIndicator from '../FullscreenLoadingIndicator';
 import * as Report from '../../libs/actions/Report';
 import Navigation from '../../libs/Navigation/Navigation';
 import ROUTES from '../../ROUTES';
+import ONYXKEYS from '../../ONYXKEYS';
+import CONST from '../../CONST';
 
-class WalletStatementModal extends React.Component {
-    constructor(props) {
-        super(props);
+const IOU_ROUTES = [ROUTES.IOU_REQUEST, ROUTES.IOU_SEND];
+const renderLoading = () => <FullScreenLoadingIndicator />;
 
-        this.authToken = lodashGet(props, 'session.authToken', null);
-        this.navigate = this.navigate.bind(this);
-    }
+function WalletStatementModal({statementPageURL, session}) {
+    const webViewRef = useRef();
+    const authToken = lodashGet(session, 'authToken', null);
 
     /**
      * Handles in-app navigation for webview links
@@ -26,54 +24,53 @@ class WalletStatementModal extends React.Component {
      * @param {String} params.type
      * @param {String} params.url
      */
-    navigate({type, url}) {
-        if (!this.webview || (type !== 'STATEMENT_NAVIGATE' && type !== 'CONCIERGE_NAVIGATE')) {
-            return;
-        }
+    const handleNavigationStateChange = useCallback(
+        ({type, url}) => {
+            if (!webViewRef.current || (type !== CONST.WALLET.WEB_MESSAGE_TYPE.STATEMENT && type !== CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE)) {
+                return;
+            }
 
-        if (type === 'CONCIERGE_NAVIGATE') {
-            this.webview.stopLoading();
-            Report.navigateToConciergeChat();
-        }
+            if (type === CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE) {
+                webViewRef.current.stopLoading();
+                Report.navigateToConciergeChat();
+            }
 
-        if (type === 'STATEMENT_NAVIGATE' && url) {
-            const iouRoutes = [ROUTES.IOU_REQUEST, ROUTES.IOU_SEND, ROUTES.IOU_BILL];
-            const navigateToIOURoute = _.find(iouRoutes, (iouRoute) => url.includes(iouRoute));
-            if (navigateToIOURoute) {
-                this.webview.stopLoading();
-                Navigation.navigate(navigateToIOURoute);
+            if (type === CONST.WALLET.WEB_MESSAGE_TYPE.STATEMENT && url) {
+                const iouRoute = _.find(IOU_ROUTES, (item) => url.includes(item));
+
+                if (iouRoute) {
+                    webViewRef.current.stopLoading();
+                    Navigation.navigate(iouRoute);
+                }
             }
-        }
-    }
+        },
+        [webViewRef],
+    );
 
-    render() {
-        return (
-            <WebView
-                ref={(node) => (this.webview = node)}
-                originWhitelist={['https://*']}
-                source={{
-                    uri: this.props.statementPageURL,
-                    headers: {
-                        Cookie: `authToken=${this.authToken}`,
-                    },
-                }}
-                incognito // 'incognito' prop required for Android, issue here https://github.com/react-native-webview/react-native-webview/issues/1352
-                startInLoadingState
-                renderLoading={() => <FullScreenLoadingIndicator />}
-                onNavigationStateChange={this.navigate}
-            />
-        );
-    }
+    return (
+        <WebView
+            ref={webViewRef}
+            originWhitelist={['https://*']}
+            source={{
+                uri: statementPageURL,
+                headers: {
+                    Cookie: `authToken=${authToken}`,
+                },
+            }}
+            incognito // 'incognito' prop required for Android, issue here https://github.com/react-native-webview/react-native-webview/issues/1352
+            startInLoadingState
+            renderLoading={renderLoading}
+            onNavigationStateChange={handleNavigationStateChange}
+        />
+    );
 }
 
+WalletStatementModal.displayName = 'WalletStatementModal';
 WalletStatementModal.propTypes = walletStatementPropTypes;
 WalletStatementModal.defaultProps = walletStatementDefaultProps;
 
-export default compose(
-    withLocalize,
-    withOnyx({
-        session: {
-            key: ONYXKEYS.SESSION,
-        },
-    }),
-)(WalletStatementModal);
+export default withOnyx({
+    session: {
+        key: ONYXKEYS.SESSION,
+    },
+})(WalletStatementModal);
diff --git a/src/components/avatarPropTypes.js b/src/components/avatarPropTypes.js
index 12ee5c622b4f..915eac995fcb 100644
--- a/src/components/avatarPropTypes.js
+++ b/src/components/avatarPropTypes.js
@@ -6,4 +6,5 @@ export default PropTypes.shape({
     type: PropTypes.oneOf([CONST.ICON_TYPE_AVATAR, CONST.ICON_TYPE_WORKSPACE]),
     name: PropTypes.string,
     id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+    fallbackIcon: PropTypes.oneOfType([PropTypes.func, PropTypes.string]),
 });
diff --git a/src/components/menuItemPropTypes.js b/src/components/menuItemPropTypes.js
index cc89f9a7b80b..e1d10ca95971 100644
--- a/src/components/menuItemPropTypes.js
+++ b/src/components/menuItemPropTypes.js
@@ -88,9 +88,6 @@ const propTypes = {
     /** A right-aligned subtitle for this menu option */
     subtitle: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
 
-    /** Style for the subtitle */
-    subtitleTextStyle: stylePropTypes,
-
     /** Flag to choose between avatar image or an icon */
     iconType: PropTypes.oneOf([CONST.ICON_TYPE_AVATAR, CONST.ICON_TYPE_ICON, CONST.ICON_TYPE_WORKSPACE]),
 
@@ -98,7 +95,7 @@ const propTypes = {
     interactive: PropTypes.bool,
 
     /** A fallback avatar icon to display when there is an error on loading avatar from remote URL. */
-    fallbackIcon: PropTypes.func,
+    fallbackIcon: PropTypes.oneOfType([PropTypes.func, PropTypes.string]),
 
     /** Avatars to show on the right of the menu item */
     floatRightAvatars: PropTypes.arrayOf(avatarPropTypes),
@@ -144,6 +141,12 @@ const propTypes = {
 
     /** Should we grey out the menu item when it is disabled? */
     shouldGreyOutWhenDisabled: PropTypes.bool,
+
+    /** Error to display below the title */
+    error: PropTypes.string,
+
+    /** Should render the content in HTML format */
+    shouldRenderAsHTML: PropTypes.bool,
 };
 
 export default propTypes;
diff --git a/src/components/optionPropTypes.js b/src/components/optionPropTypes.js
index bb1a7a073b61..709298036f07 100644
--- a/src/components/optionPropTypes.js
+++ b/src/components/optionPropTypes.js
@@ -68,6 +68,4 @@ export default PropTypes.shape({
     brickRoadIndicator: PropTypes.oneOf([CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR, '']),
 
     phoneNumber: PropTypes.string,
-
-    payPalMeAddress: PropTypes.string,
 });
diff --git a/src/components/paypalMeDataPropTypes.js b/src/components/paypalMeDataPropTypes.js
deleted file mode 100644
index 5498186748a5..000000000000
--- a/src/components/paypalMeDataPropTypes.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import PropTypes from 'prop-types';
-
-export default PropTypes.shape({
-    /** This is always 'PayPal.me' */
-    title: PropTypes.string,
-
-    /** The paypalMe address */
-    description: PropTypes.string,
-
-    /** This is always 'payPalMe' */
-    methodID: PropTypes.string,
-
-    /** This is always 'payPalMe' */
-    accountType: PropTypes.string,
-});
diff --git a/src/components/tagPropTypes.js b/src/components/tagPropTypes.js
new file mode 100644
index 000000000000..2108b65ebbd5
--- /dev/null
+++ b/src/components/tagPropTypes.js
@@ -0,0 +1,20 @@
+import PropTypes from 'prop-types';
+
+const tagListPropTypes = 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,
+});
+
+export default PropTypes.objectOf(
+    PropTypes.shape({
+        name: PropTypes.string,
+        required: PropTypes.bool,
+        tags: PropTypes.objectOf(tagListPropTypes),
+    }),
+);
diff --git a/src/components/withCurrentUserPersonalDetails.js b/src/components/withCurrentUserPersonalDetails.js
index 87a046e66983..7a47ea7cc712 100644
--- a/src/components/withCurrentUserPersonalDetails.js
+++ b/src/components/withCurrentUserPersonalDetails.js
@@ -36,7 +36,8 @@ export default function (WrappedComponent) {
 
     function WithCurrentUserPersonalDetails(props) {
         const accountID = props.session.accountID;
-        const currentUserPersonalDetails = useMemo(() => ({...props.personalDetails[accountID], accountID}), [props.personalDetails, accountID]);
+        const accountPersonalDetails = props.personalDetails[accountID];
+        const currentUserPersonalDetails = useMemo(() => ({...accountPersonalDetails, accountID}), [accountPersonalDetails, accountID]);
         return (
             <WrappedComponent
                 // eslint-disable-next-line react/jsx-props-no-spreading
diff --git a/src/components/withKeyboardState.js b/src/components/withKeyboardState.js
index 667e8865a0e3..8ddf667b4e30 100755
--- a/src/components/withKeyboardState.js
+++ b/src/components/withKeyboardState.js
@@ -1,7 +1,6 @@
-/* eslint-disable react/no-unused-state */
-import React, {forwardRef, createContext} from 'react';
-import PropTypes from 'prop-types';
+import React, {forwardRef, createContext, useEffect, useState} from 'react';
 import {Keyboard} from 'react-native';
+import PropTypes from 'prop-types';
 import getComponentDisplayName from '../libs/getComponentDisplayName';
 
 const KeyboardStateContext = createContext(null);
@@ -15,32 +14,24 @@ const keyboardStateProviderPropTypes = {
     children: PropTypes.node.isRequired,
 };
 
-class KeyboardStateProvider extends React.Component {
-    constructor(props) {
-        super(props);
-
-        this.state = {
-            isKeyboardShown: false,
-        };
-    }
-
-    componentDidMount() {
-        this.keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', () => {
-            this.setState({isKeyboardShown: true});
+function KeyboardStateProvider(props) {
+    const {children} = props;
+    const [isKeyboardShown, setIsKeyboardShown] = useState(false);
+    useEffect(() => {
+        const keyboardDidShowListener = Keyboard.addListener('keyboardDidShow', () => {
+            setIsKeyboardShown(true);
         });
-        this.keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', () => {
-            this.setState({isKeyboardShown: false});
+        const keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', () => {
+            setIsKeyboardShown(false);
         });
-    }
 
-    componentWillUnmount() {
-        this.keyboardDidShowListener.remove();
-        this.keyboardDidHideListener.remove();
-    }
+        return () => {
+            keyboardDidShowListener.remove();
+            keyboardDidHideListener.remove();
+        };
+    }, []);
 
-    render() {
-        return <KeyboardStateContext.Provider value={this.state}>{this.props.children}</KeyboardStateContext.Provider>;
-    }
+    return <KeyboardStateContext.Provider value={{isKeyboardShown}}>{children}</KeyboardStateContext.Provider>;
 }
 
 KeyboardStateProvider.propTypes = keyboardStateProviderPropTypes;
diff --git a/src/components/withLocalize.js b/src/components/withLocalize.js
index 913d085f9428..65e98f78f312 100755
--- a/src/components/withLocalize.js
+++ b/src/components/withLocalize.js
@@ -1,19 +1,7 @@
-import React, {createContext, forwardRef} from 'react';
+import React, {forwardRef} from 'react';
 import PropTypes from 'prop-types';
-import {withOnyx} from 'react-native-onyx';
-import lodashGet from 'lodash/get';
+import {LocaleContext} from './LocaleContextProvider';
 import getComponentDisplayName from '../libs/getComponentDisplayName';
-import ONYXKEYS from '../ONYXKEYS';
-import * as Localize from '../libs/Localize';
-import DateUtils from '../libs/DateUtils';
-import * as NumberFormatUtils from '../libs/NumberFormatUtils';
-import * as LocaleDigitUtils from '../libs/LocaleDigitUtils';
-import CONST from '../CONST';
-import compose from '../libs/compose';
-import withCurrentUserPersonalDetails from './withCurrentUserPersonalDetails';
-import * as LocalePhoneNumber from '../libs/LocalePhoneNumber';
-
-const LocaleContext = createContext(null);
 
 const withLocalizePropTypes = {
     /** Returns translated string for given locale and phrase */
@@ -28,6 +16,9 @@ const withLocalizePropTypes = {
     /** Formats a datetime to local date and time string */
     datetimeToCalendarTime: PropTypes.func.isRequired,
 
+    /** Updates date-fns internal locale */
+    updateLocale: PropTypes.func.isRequired,
+
     /** Returns a locally converted phone number for numbers from the same region
      * and an internationally converted phone number with the country code for numbers from other regions */
     formatPhoneNumber: PropTypes.func.isRequired,
@@ -39,125 +30,6 @@ const withLocalizePropTypes = {
     toLocaleDigit: PropTypes.func.isRequired,
 };
 
-const localeProviderPropTypes = {
-    /** The user's preferred locale e.g. 'en', 'es-ES' */
-    preferredLocale: PropTypes.string,
-
-    /** Actual content wrapped by this component */
-    children: PropTypes.node.isRequired,
-
-    /** The current user's personalDetails */
-    currentUserPersonalDetails: PropTypes.shape({
-        /** Timezone of the current user */
-        timezone: PropTypes.shape({
-            /** Value of the selected timezone */
-            selected: PropTypes.string,
-        }),
-    }),
-};
-
-const localeProviderDefaultProps = {
-    preferredLocale: CONST.LOCALES.DEFAULT,
-    currentUserPersonalDetails: {},
-};
-
-class LocaleContextProvider extends React.Component {
-    /**
-     * The context this component exposes to child components
-     * @returns {object} translation util functions and locale
-     */
-    getContextValue() {
-        return {
-            translate: this.translate.bind(this),
-            numberFormat: this.numberFormat.bind(this),
-            datetimeToRelative: this.datetimeToRelative.bind(this),
-            datetimeToCalendarTime: this.datetimeToCalendarTime.bind(this),
-            formatPhoneNumber: this.formatPhoneNumber.bind(this),
-            fromLocaleDigit: this.fromLocaleDigit.bind(this),
-            toLocaleDigit: this.toLocaleDigit.bind(this),
-            preferredLocale: this.props.preferredLocale,
-        };
-    }
-
-    /**
-     * @param {String} phrase
-     * @param {Object} [variables]
-     * @returns {String}
-     */
-    translate(phrase, variables) {
-        return Localize.translate(this.props.preferredLocale, phrase, variables);
-    }
-
-    /**
-     * @param {Number} number
-     * @param {Intl.NumberFormatOptions} options
-     * @returns {String}
-     */
-    numberFormat(number, options) {
-        return NumberFormatUtils.format(this.props.preferredLocale, number, options);
-    }
-
-    /**
-     * @param {String} datetime
-     * @returns {String}
-     */
-    datetimeToRelative(datetime) {
-        return DateUtils.datetimeToRelative(this.props.preferredLocale, datetime);
-    }
-
-    /**
-     * @param {String} datetime - ISO-formatted datetime string
-     * @param {Boolean} [includeTimezone]
-     * @param {Boolean} isLowercase
-     * @returns {String}
-     */
-    datetimeToCalendarTime(datetime, includeTimezone, isLowercase = false) {
-        return DateUtils.datetimeToCalendarTime(this.props.preferredLocale, datetime, includeTimezone, lodashGet(this.props, 'currentUserPersonalDetails.timezone.selected'), isLowercase);
-    }
-
-    /**
-     * @param {String} phoneNumber
-     * @returns {String}
-     */
-    formatPhoneNumber(phoneNumber) {
-        return LocalePhoneNumber.formatPhoneNumber(phoneNumber);
-    }
-
-    /**
-     * @param {String} digit
-     * @returns {String}
-     */
-    toLocaleDigit(digit) {
-        return LocaleDigitUtils.toLocaleDigit(this.props.preferredLocale, digit);
-    }
-
-    /**
-     * @param {String} localeDigit
-     * @returns {String}
-     */
-    fromLocaleDigit(localeDigit) {
-        return LocaleDigitUtils.fromLocaleDigit(this.props.preferredLocale, localeDigit);
-    }
-
-    render() {
-        return <LocaleContext.Provider value={this.getContextValue()}>{this.props.children}</LocaleContext.Provider>;
-    }
-}
-
-LocaleContextProvider.propTypes = localeProviderPropTypes;
-LocaleContextProvider.defaultProps = localeProviderDefaultProps;
-
-const Provider = compose(
-    withCurrentUserPersonalDetails,
-    withOnyx({
-        preferredLocale: {
-            key: ONYXKEYS.NVP_PREFERRED_LOCALE,
-        },
-    }),
-)(LocaleContextProvider);
-
-Provider.displayName = 'withOnyx(LocaleContextProvider)';
-
 export default function withLocalize(WrappedComponent) {
     const WithLocalize = forwardRef((props, ref) => (
         <LocaleContext.Consumer>
@@ -178,4 +50,4 @@ export default function withLocalize(WrappedComponent) {
     return WithLocalize;
 }
 
-export {withLocalizePropTypes, Provider as LocaleContextProvider, LocaleContext};
+export {withLocalizePropTypes};
diff --git a/src/components/withNavigationFallback.js b/src/components/withNavigationFallback.js
index bc4ea5dd3fad..e82946c9e049 100644
--- a/src/components/withNavigationFallback.js
+++ b/src/components/withNavigationFallback.js
@@ -1,39 +1,30 @@
-import React, {Component} from 'react';
+import React, {forwardRef, useContext, useMemo} from 'react';
 import {NavigationContext} from '@react-navigation/core';
 import getComponentDisplayName from '../libs/getComponentDisplayName';
 import refPropTypes from './refPropTypes';
 
 export default function (WrappedComponent) {
-    class WithNavigationFallback extends Component {
-        render() {
-            if (!this.context) {
-                return (
-                    <NavigationContext.Provider
-                        value={{
-                            isFocused: () => true,
-                            addListener: () => () => {},
-                            removeListener: () => () => {},
-                        }}
-                    >
-                        <WrappedComponent
-                            // eslint-disable-next-line react/jsx-props-no-spreading
-                            {...this.props}
-                            ref={this.props.forwardedRef}
-                        />
-                    </NavigationContext.Provider>
-                );
-            }
+    function WithNavigationFallback(props) {
+        const context = useContext(NavigationContext);
 
-            return (
+        const navigationContextValue = useMemo(() => ({isFocused: () => true, addListener: () => () => {}, removeListener: () => () => {}}), []);
+
+        return context ? (
+            <WrappedComponent
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...props}
+                ref={props.forwardedRef}
+            />
+        ) : (
+            <NavigationContext.Provider value={navigationContextValue}>
                 <WrappedComponent
                     // eslint-disable-next-line react/jsx-props-no-spreading
-                    {...this.props}
-                    ref={this.props.forwardedRef}
+                    {...props}
+                    ref={props.forwardedRef}
                 />
-            );
-        }
+            </NavigationContext.Provider>
+        );
     }
-    WithNavigationFallback.contextType = NavigationContext;
     WithNavigationFallback.displayName = `WithNavigationFocusWithFallback(${getComponentDisplayName(WrappedComponent)})`;
     WithNavigationFallback.propTypes = {
         forwardedRef: refPropTypes,
@@ -41,7 +32,8 @@ export default function (WrappedComponent) {
     WithNavigationFallback.defaultProps = {
         forwardedRef: undefined,
     };
-    return React.forwardRef((props, ref) => (
+
+    return forwardRef((props, ref) => (
         <WithNavigationFallback
             // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
diff --git a/src/components/withTheme.js b/src/components/withTheme.js
new file mode 100644
index 000000000000..99de2a2c7fc7
--- /dev/null
+++ b/src/components/withTheme.js
@@ -0,0 +1,40 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import useTheme from '../styles/themes/useTheme';
+import getComponentDisplayName from '../libs/getComponentDisplayName';
+import refPropTypes from './refPropTypes';
+
+const withThemePropTypes = {
+    theme: PropTypes.object.isRequired,
+};
+
+export default function withTheme(WrappedComponent) {
+    function WithTheme(props) {
+        const theme = useTheme();
+        return (
+            <WrappedComponent
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...props}
+                ref={props.forwardedRef}
+                theme={theme}
+            />
+        );
+    }
+
+    WithTheme.displayName = `withTheme(${getComponentDisplayName(WrappedComponent)})`;
+    WithTheme.propTypes = {
+        forwardedRef: refPropTypes,
+    };
+    WithTheme.defaultProps = {
+        forwardedRef: () => {},
+    };
+    return React.forwardRef((props, ref) => (
+        <WithTheme
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            forwardedRef={ref}
+        />
+    ));
+}
+
+export {withThemePropTypes};
diff --git a/src/components/withThemeStyles.js b/src/components/withThemeStyles.js
new file mode 100644
index 000000000000..0320fcb71808
--- /dev/null
+++ b/src/components/withThemeStyles.js
@@ -0,0 +1,40 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import useThemeStyles from '../styles/useThemeStyles';
+import getComponentDisplayName from '../libs/getComponentDisplayName';
+import refPropTypes from './refPropTypes';
+
+const withThemeStylesPropTypes = {
+    themeStyles: PropTypes.object.isRequired,
+};
+
+export default function withThemeStyles(WrappedComponent) {
+    function WithThemeStyles(props) {
+        const themeStyles = useThemeStyles();
+        return (
+            <WrappedComponent
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...props}
+                ref={props.forwardedRef}
+                themeStyles={themeStyles}
+            />
+        );
+    }
+
+    WithThemeStyles.displayName = `withThemeStyles(${getComponentDisplayName(WrappedComponent)})`;
+    WithThemeStyles.propTypes = {
+        forwardedRef: refPropTypes,
+    };
+    WithThemeStyles.defaultProps = {
+        forwardedRef: () => {},
+    };
+    return React.forwardRef((props, ref) => (
+        <WithThemeStyles
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            forwardedRef={ref}
+        />
+    ));
+}
+
+export {withThemeStylesPropTypes};
diff --git a/src/components/withWindowDimensions/index.js b/src/components/withWindowDimensions/index.js
index a3836fa99e6b..37d5c94688a2 100644
--- a/src/components/withWindowDimensions/index.js
+++ b/src/components/withWindowDimensions/index.js
@@ -1,5 +1,6 @@
 import React, {forwardRef, createContext, useState, useEffect} from 'react';
 import PropTypes from 'prop-types';
+import lodashDebounce from 'lodash/debounce';
 import {Dimensions} from 'react-native';
 import {SafeAreaInsetsContext} from 'react-native-safe-area-context';
 import getComponentDisplayName from '../../libs/getComponentDisplayName';
@@ -44,14 +45,15 @@ function WindowDimensionsProvider(props) {
     useEffect(() => {
         const onDimensionChange = (newDimensions) => {
             const {window} = newDimensions;
-
             setWindowDimension({
                 windowHeight: window.height,
                 windowWidth: window.width,
             });
         };
 
-        const dimensionsEventListener = Dimensions.addEventListener('change', onDimensionChange);
+        const onDimensionChangeDebounce = lodashDebounce(onDimensionChange, 300);
+
+        const dimensionsEventListener = Dimensions.addEventListener('change', onDimensionChangeDebounce);
 
         return () => {
             if (!dimensionsEventListener) {
diff --git a/src/hooks/useActiveElement/index.js b/src/hooks/useActiveElement/index.js
index c973eb8eda18..0db0ed604067 100644
--- a/src/hooks/useActiveElement/index.js
+++ b/src/hooks/useActiveElement/index.js
@@ -1,5 +1,11 @@
 import {useEffect, useState} from 'react';
 
+/**
+ * Listens for the focusin and focusout events and sets the DOM activeElement to the state.
+ * On native, we just return null.
+ *
+ * @return {Element} the active element in the DOM
+ */
 export default function useActiveElement() {
     const [active, setActive] = useState(document.activeElement);
 
diff --git a/src/hooks/useActiveElement/index.native.js b/src/hooks/useActiveElement/index.native.js
index 2f658d48ca9a..afdfe8a047e4 100644
--- a/src/hooks/useActiveElement/index.native.js
+++ b/src/hooks/useActiveElement/index.native.js
@@ -1,3 +1,8 @@
+/**
+ * Native doesn't have the DOM, so we just return null.
+ *
+ * @return {null}
+ */
 export default function useActiveElement() {
     return null;
 }
diff --git a/src/hooks/useArrowKeyFocusManager.js b/src/hooks/useArrowKeyFocusManager.js
index fdfdf07c99a7..58cecb169249 100644
--- a/src/hooks/useArrowKeyFocusManager.js
+++ b/src/hooks/useArrowKeyFocusManager.js
@@ -2,10 +2,6 @@ import {useState, useEffect, useCallback, useMemo} from 'react';
 import useKeyboardShortcut from './useKeyboardShortcut';
 import CONST from '../CONST';
 
-// Creating a default array this way because objects ({}) and arrays ([]) are not stable types.
-// The "disabledIndexes" array needs to be stable to prevent the "useCallback" hook from being recreated unnecessarily.
-// Freezing the array ensures that it cannot be unintentionally modified.
-const EMPTY_ARRAY = Object.freeze([]);
 /**
  * A hook that makes it easy to use the arrow keys to manage focus of items in a list
  *
@@ -24,7 +20,10 @@ export default function useArrowKeyFocusManager({
     maxIndex,
     onFocusedIndexChange = () => {},
     initialFocusedIndex = 0,
-    disabledIndexes = EMPTY_ARRAY,
+
+    // The "disabledIndexes" array needs to be stable to prevent the "useCallback" hook from being recreated unnecessarily.
+    // Hence the use of CONST.EMPTY_ARRAY.
+    disabledIndexes = CONST.EMPTY_ARRAY,
     shouldExcludeTextAreaNodes = true,
     isActive,
 }) {
diff --git a/src/hooks/useDebounce.js b/src/hooks/useDebounce.js
new file mode 100644
index 000000000000..8995a0443b85
--- /dev/null
+++ b/src/hooks/useDebounce.js
@@ -0,0 +1,37 @@
+import {useEffect, useRef} from 'react';
+import lodashDebounce from 'lodash/debounce';
+
+/**
+ * Create and return a debounced function.
+ *
+ * Every time the identity of any of the arguments changes, the debounce operation will restart (canceling any ongoing debounce).
+ * This is especially important in the case of func. To prevent that, pass stable references.
+ *
+ * @param {Function} func The function to debounce.
+ * @param {Number} wait The number of milliseconds to delay.
+ * @param {Object} options The options object.
+ * @param {Boolean} options.leading Specify invoking on the leading edge of the timeout.
+ * @param {Number} options.maxWait The maximum time func is allowed to be delayed before it’s invoked.
+ * @param {Boolean} options.trailing Specify invoking on the trailing edge of the timeout.
+ * @returns {Function} Returns a function to call the debounced function.
+ */
+export default function useDebounce(func, wait, options) {
+    const debouncedFnRef = useRef();
+    const {leading, maxWait, trailing = true} = options || {};
+
+    useEffect(() => {
+        const debouncedFn = lodashDebounce(func, wait, {leading, maxWait, trailing});
+
+        debouncedFnRef.current = debouncedFn;
+
+        return debouncedFn.cancel;
+    }, [func, wait, leading, maxWait, trailing]);
+
+    return (...args) => {
+        const debouncedFn = debouncedFnRef.current;
+
+        if (debouncedFn) {
+            debouncedFn(...args);
+        }
+    };
+}
diff --git a/src/hooks/useKeyboardShortcut.js b/src/hooks/useKeyboardShortcut.js
index 9b7244176864..b8e297c966ed 100644
--- a/src/hooks/useKeyboardShortcut.js
+++ b/src/hooks/useKeyboardShortcut.js
@@ -1,10 +1,6 @@
 import {useEffect} from 'react';
 import KeyboardShortcut from '../libs/KeyboardShortcut';
-
-// Creating a default array this way because objects ({}) and arrays ([]) are not stable types.
-// The "excludedNodes" array needs to be stable to prevent the "useEffect" hook from being recreated unnecessarily.
-// Freezing the array ensures that it cannot be unintentionally modified.
-const EMPTY_ARRAY = Object.freeze([]);
+import CONST from '../CONST';
 
 /**
  * Register a keyboard shortcut handler.
@@ -15,7 +11,17 @@ const EMPTY_ARRAY = Object.freeze([]);
  * @param {Object} [config]
  */
 export default function useKeyboardShortcut(shortcut, callback, config = {}) {
-    const {captureOnInputs = true, shouldBubble = false, priority = 0, shouldPreventDefault = true, excludedNodes = EMPTY_ARRAY, isActive = true} = config;
+    const {
+        captureOnInputs = true,
+        shouldBubble = false,
+        priority = 0,
+        shouldPreventDefault = true,
+
+        // The "excludedNodes" array needs to be stable to prevent the "useEffect" hook from being recreated unnecessarily.
+        // Hence the use of CONST.EMPTY_ARRAY.
+        excludedNodes = CONST.EMPTY_ARRAY,
+        isActive = true,
+    } = config;
 
     useEffect(() => {
         if (isActive) {
diff --git a/src/hooks/useLocalize.js b/src/hooks/useLocalize.js
index 9ad5048729bd..7f7a610fca8b 100644
--- a/src/hooks/useLocalize.js
+++ b/src/hooks/useLocalize.js
@@ -1,5 +1,5 @@
 import {useContext} from 'react';
-import {LocaleContext} from '../components/withLocalize';
+import {LocaleContext} from '../components/LocaleContextProvider';
 
 export default function useLocalize() {
     return useContext(LocaleContext);
diff --git a/src/hooks/usePrivatePersonalDetails.js b/src/hooks/usePrivatePersonalDetails.js
index 37eb63dcd0fd..14c1e42e629a 100644
--- a/src/hooks/usePrivatePersonalDetails.js
+++ b/src/hooks/usePrivatePersonalDetails.js
@@ -1,4 +1,5 @@
 import {useEffect, useContext} from 'react';
+import _ from 'underscore';
 import * as PersonalDetails from '../libs/actions/PersonalDetails';
 import {NetworkContext} from '../components/OnyxProvider';
 
@@ -9,7 +10,8 @@ export default function usePrivatePersonalDetails() {
     const {isOffline} = useContext(NetworkContext);
 
     useEffect(() => {
-        if (isOffline || Boolean(PersonalDetails.getPrivatePersonalDetails())) {
+        const personalDetails = PersonalDetails.getPrivatePersonalDetails();
+        if (isOffline || (Boolean(personalDetails) && !_.isUndefined(personalDetails.isLoading))) {
             return;
         }
         PersonalDetails.openPersonalDetailsPage();
diff --git a/src/hooks/useReportScrollManager/index.js b/src/hooks/useReportScrollManager/index.js
index 0cf09146553c..9a3303504b92 100644
--- a/src/hooks/useReportScrollManager/index.js
+++ b/src/hooks/useReportScrollManager/index.js
@@ -1,8 +1,8 @@
 import {useContext, useCallback} from 'react';
-import ReportScreenContext from '../../pages/home/ReportScreenContext';
+import {ActionListContext} from '../../pages/home/ReportScreenContext';
 
 function useReportScrollManager() {
-    const {flatListRef} = useContext(ReportScreenContext);
+    const flatListRef = useContext(ActionListContext);
 
     /**
      * Scroll to the provided index. On non-native implementations we do not want to scroll when we are scrolling because
diff --git a/src/hooks/useReportScrollManager/index.native.js b/src/hooks/useReportScrollManager/index.native.js
index 35af064cb062..d44a40222ca5 100644
--- a/src/hooks/useReportScrollManager/index.native.js
+++ b/src/hooks/useReportScrollManager/index.native.js
@@ -1,8 +1,8 @@
 import {useContext, useCallback} from 'react';
-import ReportScreenContext from '../../pages/home/ReportScreenContext';
+import {ActionListContext} from '../../pages/home/ReportScreenContext';
 
 function useReportScrollManager() {
-    const {flatListRef} = useContext(ReportScreenContext);
+    const flatListRef = useContext(ActionListContext);
 
     /**
      * Scroll to the provided index.
diff --git a/src/hooks/useWindowDimensions/index.js b/src/hooks/useWindowDimensions/index.js
index 86ff7ce85d3d..1a1f7eed5a67 100644
--- a/src/hooks/useWindowDimensions/index.js
+++ b/src/hooks/useWindowDimensions/index.js
@@ -1,5 +1,5 @@
 // eslint-disable-next-line no-restricted-imports
-import {useWindowDimensions} from 'react-native';
+import {Dimensions, useWindowDimensions} from 'react-native';
 import variables from '../../styles/variables';
 
 /**
@@ -8,7 +8,9 @@ import variables from '../../styles/variables';
  */
 export default function () {
     const {width: windowWidth, height: windowHeight} = useWindowDimensions();
-    const isExtraSmallScreenHeight = windowHeight <= variables.extraSmallMobileResponsiveHeightBreakpoint;
+    // When the soft keyboard opens on mWeb, the window height changes. Use static screen height instead to get real screenHeight.
+    const screenHeight = Dimensions.get('screen').height;
+    const isExtraSmallScreenHeight = screenHeight <= variables.extraSmallMobileResponsiveHeightBreakpoint;
     const isSmallScreenWidth = windowWidth <= variables.mobileResponsiveWidthBreakpoint;
     const isMediumScreenWidth = windowWidth > variables.mobileResponsiveWidthBreakpoint && windowWidth <= variables.tabletResponsiveWidthBreakpoint;
     const isLargeScreenWidth = windowWidth > variables.tabletResponsiveWidthBreakpoint;
diff --git a/src/languages/en.ts b/src/languages/en.ts
index f52848589663..f16097aa03d1 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -25,7 +25,6 @@ import type {
     ReportArchiveReasonsPolicyDeletedParams,
     RequestCountParams,
     SettleExpensifyCardParams,
-    SettlePaypalMeParams,
     RequestAmountParams,
     SplitAmountParams,
     AmountEachParams,
@@ -37,8 +36,7 @@ import type {
     WaitingOnBankAccountParams,
     SettledAfterAddedBankAccountParams,
     PaidElsewhereWithAmountParams,
-    PaidUsingPaypalWithAmountParams,
-    PaidUsingExpensifyWithAmountParams,
+    PaidWithExpensifyWithAmountParams,
     ThreadRequestReportNameParams,
     ThreadSentMoneyReportNameParams,
     SizeExceededParams,
@@ -71,9 +69,23 @@ import type {
     SetTheRequestParams,
     UpdatedTheRequestParams,
     RemovedTheRequestParams,
+    FormattedMaxLengthParams,
+    RequestedAmountMessageParams,
+    TagSelectionParams,
+    TranslationBase,
+    WalletProgramParams,
 } 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: {
@@ -195,9 +207,9 @@ export default {
         done: 'Done',
         more: 'More',
         debitCard: 'Debit card',
-        payPalMe: 'PayPal.me',
         bankAccount: 'Bank account',
         join: 'Join',
+        joinThread: 'Join thread',
         decline: 'Decline',
         transferBalance: 'Transfer balance',
         cantFindAddress: "Can't find your address? ",
@@ -233,6 +245,9 @@ export default {
         showMore: 'Show more',
         merchant: 'Merchant',
         category: 'Category',
+        billable: 'Billable',
+        nonBillable: 'Non-billable',
+        tag: 'Tag',
         receipt: 'Receipt',
         replace: 'Replace',
         distance: 'Distance',
@@ -242,6 +257,7 @@ export default {
         kilometers: 'kilometers',
         recent: 'Recent',
         all: 'All',
+        tbd: 'TBD',
     },
     anonymousReportFooter: {
         logoTagline: 'Join the discussion.',
@@ -270,6 +286,7 @@ export default {
     composer: {
         noExtensionFoundForMimeType: 'No extension found for mime type',
         problemGettingImageYouPasted: 'There was a problem getting the image you pasted',
+        commentExceededMaxLength: ({formattedMaxLength}: FormattedMaxLengthParams) => `The maximum comment length is ${formattedMaxLength} characters.`,
     },
     baseUpdateAppModal: {
         updateApp: 'Update app',
@@ -332,11 +349,6 @@ export default {
             `It's always great to see a new face around here! Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
         welcomeEnterMagicCode: ({login}: WelcomeEnterMagicCodeParams) => `Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
     },
-    DownloadAppModal: {
-        downloadTheApp: 'Download the app',
-        keepTheConversationGoing: 'Keep the conversation going in New Expensify, download the app for an enhanced experience.',
-        noThanks: 'No thanks',
-    },
     login: {
         hero: {
             header: 'Split bills, request payments, and chat with friends.',
@@ -448,13 +460,10 @@ export default {
         },
     },
     sidebarScreen: {
-        fabAction: 'New chat',
-        newChat: 'New chat',
-        newGroup: 'New group',
-        newRoom: 'New room',
         buttonSearch: 'Search',
         buttonMySettings: 'My settings',
-        fabNewChat: 'New chat (Floating action)',
+        fabNewChat: 'Send message',
+        fabNewChatExplained: 'Send message (Floating action)',
         chatPinned: 'Chat pinned',
         draftedMessage: 'Drafted message',
         listOfChatMessages: 'List of chat messages',
@@ -462,6 +471,8 @@ export default {
         saveTheWorld: 'Save the world',
     },
     tabSelector: {
+        chat: 'Chat',
+        room: 'Room',
         manual: 'Manual',
         scan: 'Scan',
     },
@@ -481,6 +492,7 @@ export default {
         flash: 'flash',
         shutter: 'shutter',
         gallery: 'gallery',
+        addReceipt: 'Add receipt',
     },
     iou: {
         amount: 'Amount',
@@ -488,9 +500,10 @@ export default {
         approved: 'Approved',
         cash: 'Cash',
         split: 'Split',
+        addToSplit: 'Add to split',
+        splitBill: 'Split bill',
         request: 'Request',
         participants: 'Participants',
-        splitBill: 'Split bill',
         requestMoney: 'Request money',
         sendMoney: 'Send money',
         pay: 'Pay',
@@ -498,6 +511,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` : ''}`,
@@ -505,11 +519,10 @@ export default {
         deleteConfirmation: 'Are you sure that you want to delete this request?',
         settledExpensify: 'Paid',
         settledElsewhere: 'Paid elsewhere',
-        settledPaypalMe: 'Paid using Paypal.me',
         settleExpensify: ({formattedAmount}: SettleExpensifyCardParams) => `Pay ${formattedAmount} with Expensify`,
         payElsewhere: 'Pay elsewhere',
-        settlePaypalMe: ({formattedAmount}: SettlePaypalMeParams) => `Pay ${formattedAmount} with PayPal.me`,
         requestAmount: ({amount}: RequestAmountParams) => `request ${amount}`,
+        requestedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `requested ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
         splitAmount: ({amount}: SplitAmountParams) => `split ${amount}`,
         amountEach: ({amount}: AmountEachParams) => `${amount} each`,
         payerOwesAmount: ({payer, amount}: PayerOwesAmountParams) => `${payer} owes ${amount}`,
@@ -521,9 +534,8 @@ export default {
         waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `started settling up, payment is held until ${submitterDisplayName} adds a bank account`,
         settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) =>
             `${submitterDisplayName} added a bank account. The ${amount} payment has been made.`,
-        paidElsewhereWithAmount: ({amount}: PaidElsewhereWithAmountParams) => `paid ${amount} elsewhere`,
-        paidUsingPaypalWithAmount: ({amount}: PaidUsingPaypalWithAmountParams) => `paid ${amount} using Paypal.me`,
-        paidUsingExpensifyWithAmount: ({amount}: PaidUsingExpensifyWithAmountParams) => `paid ${amount} using Expensify`,
+        paidElsewhereWithAmount: ({payer, amount}: PaidElsewhereWithAmountParams) => `${payer} paid ${amount} elsewhere`,
+        paidWithExpensifyWithAmount: ({payer, amount}: PaidWithExpensifyWithAmountParams) => `${payer} paid ${amount} using Expensify`,
         noReimbursableExpenses: 'This report has an invalid amount',
         pendingConversionMessage: "Total will update when you're back online",
         changedTheRequest: 'changed the request',
@@ -533,7 +545,9 @@ 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: {
+            invalidAmount: 'Please enter a valid amount before continuing.',
             invalidSplit: 'Split amounts do not equal total amount',
             other: 'Unexpected error, please try again later',
             genericCreateFailureMessage: 'Unexpected error requesting money, please try again later',
@@ -559,6 +573,8 @@ export default {
         uploadPhoto: 'Upload photo',
         removePhoto: 'Remove photo',
         editImage: 'Edit photo',
+        viewPhoto: 'View photo',
+        imageUploadFailed: 'Image upload failed',
         deleteWorkspaceError: 'Sorry, there was an unexpected problem deleting your workspace avatar.',
         sizeExceeded: ({maxUploadSizeInMB}: SizeExceededParams) => `The selected image exceeds the maximum upload size of ${maxUploadSizeInMB}MB.`,
         resolutionConstraints: ({minHeightInPx, minWidthInPx, maxHeightInPx, maxWidthInPx}: ResolutionConstraintsParams) =>
@@ -578,6 +594,7 @@ export default {
         online: 'Online',
         offline: 'Offline',
         syncing: 'Syncing',
+        profileAvatar: 'Profile avatar',
     },
     loungeAccessPage: {
         loungeAccess: 'Lounge access',
@@ -719,6 +736,7 @@ export default {
         keepCodesSafe: 'Keep these recovery codes safe!',
         codesLoseAccess:
             'If you lose access to your authenticator app and don’t have these codes, you will lose access to your account. \n\nNote: Setting up two-factor authentication will log you out of all other active sessions.',
+        errorStepCodes: 'Please copy or download codes before continuing.',
         stepVerify: 'Verify',
         scanCode: 'Scan the QR code using your',
         authenticatorApp: 'authenticator app',
@@ -730,6 +748,15 @@ export default {
         copy: 'Copy',
         disable: 'Disable',
     },
+    recoveryCodeForm: {
+        error: {
+            pleaseFillRecoveryCode: 'Please enter your recovery code',
+            incorrectRecoveryCode: 'Incorrect recovery code. Please try again.',
+        },
+        useRecoveryCode: 'Use recovery code',
+        recoveryCode: 'Recovery code',
+        use2fa: 'Use two-factor authentication code',
+    },
     twoFactorAuthForm: {
         error: {
             pleaseFillTwoFactorAuth: 'Please enter your two-factor authentication code',
@@ -740,17 +767,13 @@ export default {
         passwordUpdated: 'Password updated!',
         allSet: 'You’re all set. Keep your new password safe.',
     },
-    addPayPalMePage: {
-        enterYourUsernameToGetPaidViaPayPal: 'Get paid back via PayPal.',
-        payPalMe: 'PayPal.me/',
-        yourPayPalUsername: 'Your PayPal username',
-        addPayPalAccount: 'Add PayPal account',
-        growlMessageOnSave: 'Your PayPal username was successfully added',
-        updatePaypalAccount: 'Save PayPal account',
-        growlMessageOnUpdate: 'Your PayPal username was successfully saved',
-        formatError: 'Invalid PayPal.me username',
-        checkListOf: 'Check the list of ',
-        supportedCurrencies: 'supported currencies',
+    privateNotes: {
+        title: 'Private notes',
+        personalNoteMessage: 'Keep notes about this chat here. You are the only person who can add, edit or view these notes.',
+        sharedNoteMessage: 'Keep notes about this chat here. Expensify employees and other users on the team.expensify.com domain can view these notes.',
+        notesUnavailable: 'No notes found for the user',
+        composerLabel: 'Notes',
+        myNote: 'My note',
     },
     addDebitCardPage: {
         addADebitCard: 'Add a debit card',
@@ -781,7 +804,6 @@ export default {
         setDefaultSuccess: 'Default payment method set!',
         deleteAccount: 'Delete account',
         deleteConfirmation: 'Are you sure that you want to delete this account?',
-        deletePayPalSuccess: 'PayPal.me successfully deleted',
         error: {
             notOwnerOfBankAccount: 'There was an error setting this bank account as your default payment method.',
             invalidBankAccount: 'This bank account is temporarily suspended.',
@@ -790,6 +812,12 @@ export default {
         },
         addBankAccountFailure: 'An unexpected error occurred while trying to add your bank account. Please try again.',
     },
+    cardPage: {
+        expensifyCard: 'Expensify Card',
+        availableSpend: 'Remaining spending power',
+        virtualCardNumber: 'Virtual card number',
+        physicalCardNumber: 'Physical card number',
+    },
     transferAmountPage: {
         transfer: ({amount}: TransferParams) => `Transfer${amount ? ` ${amount}` : ''}`,
         instant: 'Instant (Debit card)',
@@ -882,12 +910,13 @@ export default {
         phrase2: 'Terms of Service',
         phrase3: 'and',
         phrase4: 'Privacy',
-        phrase5: 'Money transmission is provided by Expensify Payments LLC (NMLS ID:2017010) pursuant to its',
+        phrase5: `Money transmission is provided by ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} (NMLS ID:2017010) pursuant to its`,
         phrase6: 'licenses',
     },
     validateCodeForm: {
         magicCodeNotReceived: "Didn't receive a magic code?",
         enterAuthenticatorCode: 'Please enter your authenticator code',
+        enterRecoveryCode: 'Please enter your recovery code',
         requiredWhen2FAEnabled: 'Required when 2FA is enabled',
         requestNewCode: 'Request a new code in ',
         requestNewCodeAfterErrorOccurred: 'Request a new code',
@@ -974,7 +1003,9 @@ export default {
         localTime: 'Local time',
     },
     newChatPage: {
+        createChat: 'Create chat',
         createGroup: 'Create group',
+        addToGroup: 'Add to group',
     },
     yearPickerPage: {
         year: 'Year',
@@ -987,7 +1018,7 @@ export default {
         notHere: "Hmm... it's not here",
         pageNotFound: 'Oops, this page cannot be found',
         noAccess: "You don't have access to this chat",
-        goBackHome: 'Go back to Home page',
+        goBackHome: 'Go back to home page',
     },
     setPasswordPage: {
         enterPassword: 'Enter a password',
@@ -1043,7 +1074,7 @@ export default {
             noBankAccountSelected: 'Please choose an account',
             taxID: 'Please enter a valid tax ID number',
             website: 'Please enter a valid website',
-            zipCode: 'Please enter a valid zip code',
+            zipCode: `Incorrect zip code format. Acceptable format: ${CONST.COUNTRY_ZIP_REGEX_DATA.US.samples}`,
             phoneNumber: 'Please enter a valid phone number',
             companyName: 'Please enter a valid legal business name',
             addressCity: 'Please enter a valid city',
@@ -1140,7 +1171,7 @@ export default {
         electronicFundsWithdrawal: 'Electronic funds withdrawal',
         standard: 'Standard',
         shortTermsForm: {
-            expensifyPaymentsAccount: 'The Expensify Wallet is issued by The Bancorp Bank.',
+            expensifyPaymentsAccount: ({walletProgram}: WalletProgramParams) => `The Expensify Wallet is issued by ${walletProgram}.`,
             perPurchase: 'Per purchase',
             atmWithdrawal: 'ATM withdrawal',
             cashReload: 'Cash reload',
@@ -1182,10 +1213,10 @@ export default {
                 'several minutes. The fee is 1.5% of the transfer amount (with a minimum fee of $0.25).',
             fdicInsuranceBancorp:
                 'Your funds are eligible for FDIC insurance. Your funds will be held at or ' +
-                'transferred to The Bancorp Bank, an FDIC-insured institution. Once there, your funds are insured up ' +
-                'to $250,000 by the FDIC in the event The Bancorp Bank fails. See',
+                `transferred to ${CONST.WALLET.PROGRAM_ISSUERS.BANCORP_BANK}, an FDIC-insured institution. Once there, your funds are insured up ` +
+                `to $250,000 by the FDIC in the event ${CONST.WALLET.PROGRAM_ISSUERS.BANCORP_BANK} fails. See`,
             fdicInsuranceBancorp2: 'for details.',
-            contactExpensifyPayments: 'Contact Expensify Payments by calling +1 833-400-0904, by email at',
+            contactExpensifyPayments: `Contact ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} by calling +1 833-400-0904, by email at`,
             contactExpensifyPayments2: 'or sign in at',
             generalInformation: 'For general information about prepaid accounts, visit',
             generalInformation2: 'If you have a complaint about a prepaid account, call the Consumer Financial Protection Bureau at 1-855-411-2372 or visit',
@@ -1298,6 +1329,7 @@ export default {
             memberNotFound: 'Member not found. To invite a new member to the workspace, please use the Invite button above.',
             notAuthorized: `You do not have access to this page. Are you trying to join the workspace? Please reach out to the owner of this workspace so they can add you as a member! Something else? Reach out to ${CONST.EMAIL.CONCIERGE}`,
             goToRoom: ({roomName}: GoToRoomParams) => `Go to ${roomName} room`,
+            workspaceAvatar: 'Workspace avatar',
         },
         emptyWorkspace: {
             title: 'Create a new workspace',
@@ -1339,7 +1371,6 @@ export default {
         reimburse: {
             captureReceipts: 'Capture receipts',
             fastReimbursementsHappyMembers: 'Fast reimbursements = happy members!',
-            kilometers: 'Kilometers',
             viewAllReceipts: 'View all receipts',
             reimburseReceipts: 'Reimburse receipts',
             trackDistance: 'Track distance',
@@ -1505,12 +1536,12 @@ export default {
         assignee: 'Assignee',
         completed: 'Completed',
         messages: {
-            completed: 'completed task',
-            canceled: 'canceled task',
-            reopened: 'reopened task',
+            completed: 'marked as complete',
+            canceled: 'deleted task',
+            reopened: 'marked as incomplete',
             error: 'You do not have the permission to do the requested action.',
         },
-        markAsDone: 'Mark as done',
+        markAsComplete: 'Mark as complete',
         markAsIncomplete: 'Mark as incomplete',
         assigneeError: 'There was an error assigning this task, please try another assignee.',
     },
@@ -1524,7 +1555,7 @@ export default {
             openShortcutDialog: 'Opens the keyboard shortcuts dialog',
             escape: 'Escape dialogs',
             search: 'Open search dialog',
-            newGroup: 'New group screen',
+            newChat: 'New chat screen',
             copy: 'Copy comment',
         },
     },
@@ -1660,8 +1691,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',
@@ -1678,6 +1709,7 @@ export default {
     parentReportAction: {
         deletedMessage: '[Deleted message]',
         deletedRequest: '[Deleted request]',
+        deletedTask: '[Deleted task]',
         hiddenMessage: '[Hidden message]',
     },
     threads: {
@@ -1755,14 +1787,4 @@ export default {
             selectSuggestedAddress: 'Please select a suggested address',
         },
     },
-    demos: {
-        saastr: {
-            signInWelcome: 'Welcome to SaaStr! Hop in to start networking now.',
-            heroBody: 'Use New Expensify for event updates, networking, social chatter, and to get paid back for lunch!',
-        },
-        sbe: {
-            signInWelcome: 'Welcome to Small Business Expo! Get paid back for your ride.',
-            heroBody: 'Use New Expensify for event updates, networking, social chatter, and to get paid back for your ride to or from the show!',
-        },
-    },
-} as const;
+} satisfies TranslationBase;
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 8610f41308e1..3860c34f6ef1 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -25,7 +25,6 @@ import type {
     ReportArchiveReasonsPolicyDeletedParams,
     RequestCountParams,
     SettleExpensifyCardParams,
-    SettlePaypalMeParams,
     RequestAmountParams,
     SplitAmountParams,
     AmountEachParams,
@@ -37,8 +36,7 @@ import type {
     WaitingOnBankAccountParams,
     SettledAfterAddedBankAccountParams,
     PaidElsewhereWithAmountParams,
-    PaidUsingPaypalWithAmountParams,
-    PaidUsingExpensifyWithAmountParams,
+    PaidWithExpensifyWithAmountParams,
     ThreadRequestReportNameParams,
     ThreadSentMoneyReportNameParams,
     SizeExceededParams,
@@ -71,6 +69,11 @@ import type {
     SetTheRequestParams,
     UpdatedTheRequestParams,
     RemovedTheRequestParams,
+    FormattedMaxLengthParams,
+    RequestedAmountMessageParams,
+    TagSelectionParams,
+    EnglishTranslation,
+    WalletProgramParams,
 } from './types';
 
 /* eslint-disable max-len */
@@ -194,9 +197,9 @@ export default {
         done: 'Listo',
         more: 'Más',
         debitCard: 'Tarjeta de débito',
-        payPalMe: 'PayPal.me',
         bankAccount: 'Cuenta bancaria',
         join: 'Unirse',
+        joinThread: 'Unirse al hilo',
         decline: 'Rechazar',
         transferBalance: 'Transferencia de saldo',
         cantFindAddress: '¿No encuentras tu dirección? ',
@@ -232,6 +235,9 @@ export default {
         showMore: 'Mostrar más',
         merchant: 'Comerciante',
         category: 'Categoría',
+        billable: 'Facturable',
+        nonBillable: 'No facturable',
+        tag: 'Etiqueta',
         receipt: 'Recibo',
         replace: 'Sustituir',
         distance: 'Distancia',
@@ -241,6 +247,7 @@ export default {
         kilometers: 'kilómetros',
         recent: 'Reciente',
         all: 'Todo',
+        tbd: 'Por determinar',
     },
     anonymousReportFooter: {
         logoTagline: 'Únete a la discusión.',
@@ -269,6 +276,7 @@ export default {
     composer: {
         noExtensionFoundForMimeType: 'No se encontró una extension para este tipo de contenido',
         problemGettingImageYouPasted: 'Ha ocurrido un problema al obtener la imagen que has pegado',
+        commentExceededMaxLength: ({formattedMaxLength}: FormattedMaxLengthParams) => `El comentario debe tener máximo ${formattedMaxLength} caracteres.`,
     },
     baseUpdateAppModal: {
         updateApp: 'Actualizar app',
@@ -332,11 +340,6 @@ export default {
             `¡Siempre es genial ver una cara nueva por aquí! Por favor ingresa el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
         welcomeEnterMagicCode: ({login}: WelcomeEnterMagicCodeParams) => `Por favor, introduce el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
     },
-    DownloadAppModal: {
-        downloadTheApp: 'Descarga la aplicación',
-        keepTheConversationGoing: 'Mantén la conversación en New Expensify, descarga la aplicación para una experiencia mejorada.',
-        noThanks: 'No, gracias',
-    },
     login: {
         hero: {
             header: 'Divida las facturas, solicite pagos y chatee con sus amigos.',
@@ -449,13 +452,10 @@ export default {
         },
     },
     sidebarScreen: {
-        fabAction: 'Nuevo chat',
-        newChat: 'Nuevo chat',
-        newGroup: 'Nuevo grupo',
-        newRoom: 'Nueva sala de chat',
         buttonSearch: 'Buscar',
         buttonMySettings: 'Mi configuración',
-        fabNewChat: 'Nuevo chat',
+        fabNewChat: 'Enviar mensaje',
+        fabNewChatExplained: 'Enviar mensaje',
         chatPinned: 'Chat fijado',
         draftedMessage: 'Mensaje borrador',
         listOfChatMessages: 'Lista de mensajes del chat',
@@ -463,6 +463,8 @@ export default {
         saveTheWorld: 'Salvar el mundo',
     },
     tabSelector: {
+        chat: 'Chat',
+        room: 'Sala',
         manual: 'Manual',
         scan: 'Escanear',
     },
@@ -482,6 +484,7 @@ export default {
         flash: 'flash',
         shutter: 'obturador',
         gallery: 'galería',
+        addReceipt: 'Añadir recibo',
     },
     iou: {
         amount: 'Importe',
@@ -489,9 +492,10 @@ export default {
         approved: 'Aprobado',
         cash: 'Efectivo',
         split: 'Dividir',
+        addToSplit: 'Añadir para dividir',
+        splitBill: 'Dividir factura',
         request: 'Solicitar',
         participants: 'Participantes',
-        splitBill: 'Dividir factura',
         requestMoney: 'Pedir dinero',
         sendMoney: 'Enviar dinero',
         pay: 'Pagar',
@@ -499,6 +503,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` : ''}`,
@@ -506,11 +511,10 @@ export default {
         deleteConfirmation: '¿Estás seguro de que quieres eliminar este pedido?',
         settledExpensify: 'Pagado',
         settledElsewhere: 'Pagado de otra forma',
-        settledPaypalMe: 'Pagado con PayPal.me',
         settleExpensify: ({formattedAmount}: SettleExpensifyCardParams) => `Pagar ${formattedAmount} con Expensify`,
         payElsewhere: 'Pagar de otra forma',
-        settlePaypalMe: ({formattedAmount}: SettlePaypalMeParams) => `Pagar ${formattedAmount} con PayPal.me`,
         requestAmount: ({amount}: RequestAmountParams) => `solicitar ${amount}`,
+        requestedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `solicité ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
         splitAmount: ({amount}: SplitAmountParams) => `dividir ${amount}`,
         amountEach: ({amount}: AmountEachParams) => `${amount} cada uno`,
         payerOwesAmount: ({payer, amount}: PayerOwesAmountParams) => `${payer} debe ${amount}`,
@@ -522,9 +526,8 @@ export default {
         waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `inicio el pago, pero no se procesará hasta que ${submitterDisplayName} añada una cuenta bancaria`,
         settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) =>
             `${submitterDisplayName} añadió una cuenta bancaria. El pago de ${amount} se ha realizado.`,
-        paidElsewhereWithAmount: ({amount}: PaidElsewhereWithAmountParams) => `pagó ${amount} de otra forma`,
-        paidUsingPaypalWithAmount: ({amount}: PaidUsingPaypalWithAmountParams) => `pagó ${amount} con PayPal.me`,
-        paidUsingExpensifyWithAmount: ({amount}: PaidUsingExpensifyWithAmountParams) => `pagó ${amount} con Expensify`,
+        paidElsewhereWithAmount: ({payer, amount}: PaidElsewhereWithAmountParams) => `${payer} pagó ${amount} de otra forma`,
+        paidWithExpensifyWithAmount: ({payer, amount}: PaidWithExpensifyWithAmountParams) => `${payer} pagó ${amount} con Expensify`,
         noReimbursableExpenses: 'El importe de este informe no es válido',
         pendingConversionMessage: 'El total se actualizará cuando estés online',
         changedTheRequest: 'cambió la solicitud',
@@ -535,7 +538,9 @@ 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: {
+            invalidAmount: 'Por favor ingresa un monto válido antes de continuar.',
             invalidSplit: 'La suma de las partes no equivale al monto total',
             other: 'Error inesperado, por favor inténtalo más tarde',
             genericCreateFailureMessage: 'Error inesperado solicitando dinero, Por favor, inténtalo más tarde',
@@ -561,6 +566,8 @@ export default {
         uploadPhoto: 'Subir foto',
         removePhoto: 'Eliminar foto',
         editImage: 'Editar foto',
+        viewPhoto: 'Ver foto',
+        imageUploadFailed: 'Error al cargar la imagen',
         deleteWorkspaceError: 'Lo sentimos, hubo un problema eliminando el avatar de su espacio de trabajo.',
         sizeExceeded: ({maxUploadSizeInMB}: SizeExceededParams) => `La imagen supera el tamaño máximo de ${maxUploadSizeInMB}MB.`,
         resolutionConstraints: ({minHeightInPx, minWidthInPx, maxHeightInPx, maxWidthInPx}: ResolutionConstraintsParams) =>
@@ -580,6 +587,7 @@ export default {
         online: 'En línea',
         offline: 'Desconectado',
         syncing: 'Sincronizando',
+        profileAvatar: 'Perfil avatar',
     },
     loungeAccessPage: {
         loungeAccess: 'Acceso a la sala vip',
@@ -723,6 +731,7 @@ export default {
         keepCodesSafe: '¡Guarda los códigos de recuperación en un lugar seguro!',
         codesLoseAccess:
             'Si pierdes el acceso a tu aplicación de autenticación y no tienes estos códigos, perderás el acceso a tu cuenta. \n\nNota: Configurar la autenticación de dos factores cerrará la sesión de todas las demás sesiones activas.',
+        errorStepCodes: 'Copia o descarga los códigos antes de continuar.',
         stepVerify: 'Verificar',
         scanCode: 'Escanea el código QR usando tu',
         authenticatorApp: 'aplicación de autenticación',
@@ -734,6 +743,15 @@ export default {
         copy: 'Copiar',
         disable: 'Deshabilitar',
     },
+    recoveryCodeForm: {
+        error: {
+            pleaseFillRecoveryCode: 'Por favor, introduce tu código de recuperación',
+            incorrectRecoveryCode: 'Código de recuperación incorrecto. Por favor, inténtalo de nuevo',
+        },
+        useRecoveryCode: 'Usar código de recuperación',
+        recoveryCode: 'Código de recuperación',
+        use2fa: 'Usar autenticación de dos factores',
+    },
     twoFactorAuthForm: {
         error: {
             pleaseFillTwoFactorAuth: 'Por favor, introduce tu código de autenticación de dos factores',
@@ -744,17 +762,13 @@ export default {
         passwordUpdated: 'Contraseña actualizada!',
         allSet: 'Todo está listo. Guarda tu contraseña en un lugar seguro.',
     },
-    addPayPalMePage: {
-        enterYourUsernameToGetPaidViaPayPal: 'Recibe pagos vía PayPal.',
-        payPalMe: 'PayPal.me/',
-        yourPayPalUsername: 'Tu usuario de PayPal',
-        addPayPalAccount: 'Añadir cuenta de PayPal',
-        growlMessageOnSave: 'Tu nombre de usuario de PayPal se añadió correctamente',
-        updatePaypalAccount: 'Guardar cuenta PayPal',
-        growlMessageOnUpdate: 'Su nombre de usuario de PayPal se guardó con éxito',
-        formatError: 'Usuario PayPal.me no válido',
-        checkListOf: 'Consulta la lista de ',
-        supportedCurrencies: 'monedas admitidas',
+    privateNotes: {
+        title: 'Notas privadas',
+        personalNoteMessage: 'Guarda notas sobre este chat aquí. Usted es la única persona que puede añadir, editar o ver estas notas.',
+        sharedNoteMessage: 'Guarda notas sobre este chat aquí. Los empleados de Expensify y otros usuarios del dominio team.expensify.com pueden ver estas notas.',
+        notesUnavailable: 'No se han encontrado notas para el usuario',
+        composerLabel: 'Notas',
+        myNote: 'Mi notas',
     },
     addDebitCardPage: {
         addADebitCard: 'Añadir una tarjeta de débito',
@@ -785,7 +799,6 @@ export default {
         setDefaultSuccess: 'Método de pago configurado',
         deleteAccount: 'Eliminar cuenta',
         deleteConfirmation: '¿Estás seguro de que quieres eliminar esta cuenta?',
-        deletePayPalSuccess: 'PayPal.me eliminada correctamente',
         error: {
             notOwnerOfBankAccount: 'Ha ocurrido un error al establecer esta cuenta bancaria como método de pago predeterminado.',
             invalidBankAccount: 'Esta cuenta bancaria está temporalmente suspendida.',
@@ -794,6 +807,12 @@ export default {
         },
         addBankAccountFailure: 'Ocurrió un error inesperado al intentar añadir la cuenta bancaria. Inténtalo de nuevo.',
     },
+    cardPage: {
+        expensifyCard: 'Tarjeta Expensify',
+        availableSpend: 'Capacidad de gasto restante',
+        virtualCardNumber: 'Número de la tarjeta virtual',
+        physicalCardNumber: 'Número de la tarjeta física',
+    },
     transferAmountPage: {
         transfer: ({amount}: TransferParams) => `Transferir${amount ? ` ${amount}` : ''}`,
         instant: 'Instante',
@@ -887,12 +906,13 @@ export default {
         phrase2: 'Términos de Servicio',
         phrase3: 'y',
         phrase4: 'Privacidad',
-        phrase5: 'El envío de dinero es brindado por Expensify Payments LLC (NMLS ID:2017010) de conformidad con sus',
+        phrase5: `El envío de dinero es brindado por ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} (NMLS ID:2017010) de conformidad con sus`,
         phrase6: 'licencias',
     },
     validateCodeForm: {
         magicCodeNotReceived: '¿No recibiste un código mágico?',
         enterAuthenticatorCode: 'Por favor, introduce el código de autenticador',
+        enterRecoveryCode: 'Por favor, introduce tu código de recuperación',
         requiredWhen2FAEnabled: 'Obligatorio cuando A2F está habilitado',
         requestNewCode: 'Pedir un código nuevo en ',
         requestNewCodeAfterErrorOccurred: 'Solicitar un nuevo código',
@@ -981,7 +1001,9 @@ export default {
         localTime: 'Hora local',
     },
     newChatPage: {
+        createChat: 'Crear chat',
         createGroup: 'Crear grupo',
+        addToGroup: 'Añadir al grupo',
     },
     yearPickerPage: {
         year: 'Año',
@@ -1067,7 +1089,7 @@ export default {
             noBankAccountSelected: 'Por favor, elige una cuenta bancaria',
             taxID: 'Por favor, introduce un número de identificación fiscal válido',
             website: 'Por favor, introduce un sitio web válido',
-            zipCode: 'Por favor, introduce un código postal válido',
+            zipCode: `Formato de código postal incorrecto. Formato aceptable: ${CONST.COUNTRY_ZIP_REGEX_DATA.US.samples}`,
             phoneNumber: 'Por favor, introduce un teléfono válido',
             companyName: 'Por favor, introduce un nombre comercial legal válido',
             addressCity: 'Por favor, introduce una ciudad válida',
@@ -1166,7 +1188,7 @@ export default {
         electronicFundsWithdrawal: 'Retiro electrónico de fondos',
         standard: 'Estándar',
         shortTermsForm: {
-            expensifyPaymentsAccount: 'La billetera Expensify es emitida por The Bancorp Bank.',
+            expensifyPaymentsAccount: ({walletProgram}: WalletProgramParams) => `La billetera Expensify es emitida por ${walletProgram}.`,
             perPurchase: 'Por compra',
             atmWithdrawal: 'Retiro de cajero automático',
             cashReload: 'Recarga de efectivo',
@@ -1209,10 +1231,10 @@ export default {
                 'transferencia (con una tarifa mínima de $ 0.25). ',
             fdicInsuranceBancorp:
                 'Sus fondos son elegibles para el seguro de la FDIC. Sus fondos se mantendrán en o ' +
-                'transferido a The Bancorp Bank, una institución asegurada por la FDIC. Una vez allí, sus fondos ' +
-                'están asegurados a $ 250,000 por la FDIC en caso de que The Bancorp Bank quiebre. Ver',
+                `transferido a ${CONST.WALLET.PROGRAM_ISSUERS.BANCORP_BANK}, una institución asegurada por la FDIC. Una vez allí, sus fondos ` +
+                `están asegurados a $ 250,000 por la FDIC en caso de que ${CONST.WALLET.PROGRAM_ISSUERS.BANCORP_BANK} quiebre. Ver`,
             fdicInsuranceBancorp2: 'para detalles.',
-            contactExpensifyPayments: 'Comuníquese con Expensify Payments llamando al + 1833-400-0904, por correoelectrónico a',
+            contactExpensifyPayments: `Comuníquese con ${CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS} llamando al + 1833-400-0904, por correoelectrónico a`,
             contactExpensifyPayments2: 'o inicie sesión en',
             generalInformation: 'Para obtener información general sobre cuentas prepagas, visite',
             generalInformation2: 'Si tiene una queja sobre una cuenta prepaga, llame al Consumer Financial Oficina de Protección al 1-855-411-2372 o visite',
@@ -1326,6 +1348,7 @@ export default {
             memberNotFound: 'Miembro no encontrado. Para invitar a un nuevo miembro al espacio de trabajo, por favor, utiliza el botón Invitar que está arriba.',
             notAuthorized: `No tienes acceso a esta página. ¿Estás tratando de unirte al espacio de trabajo? Comunícate con el propietario de este espacio de trabajo para que pueda añadirte como miembro. ¿Necesitas algo más? Comunícate con ${CONST.EMAIL.CONCIERGE}`,
             goToRoom: ({roomName}: GoToRoomParams) => `Ir a la sala ${roomName}`,
+            workspaceAvatar: 'Espacio de trabajo avatar',
         },
         emptyWorkspace: {
             title: 'Crear un nuevo espacio de trabajo',
@@ -1368,7 +1391,6 @@ export default {
         reimburse: {
             captureReceipts: 'Captura recibos',
             fastReimbursementsHappyMembers: '¡Reembolsos rápidos = miembros felices!',
-            kilometers: 'Kilómetros',
             viewAllReceipts: 'Ver todos los recibos',
             reimburseReceipts: 'Reembolsar recibos',
             trackDistance: 'Medir distancia',
@@ -1536,12 +1558,12 @@ export default {
         assignee: 'Usuario asignado',
         completed: 'Completada',
         messages: {
-            completed: 'tarea completada',
-            canceled: 'tarea cancelada',
-            reopened: 'tarea reabrir',
+            completed: 'marcada como completa',
+            canceled: 'tarea eliminado',
+            reopened: 'marcada como incompleta',
             error: 'No tiene permiso para realizar la acción solicitada.',
         },
-        markAsDone: 'Marcar como completada',
+        markAsComplete: 'Marcar como completada',
         markAsIncomplete: 'Marcar como incompleta',
         assigneeError: 'Hubo un error al asignar esta tarea, inténtalo con otro usuario.',
     },
@@ -1555,7 +1577,7 @@ export default {
             openShortcutDialog: 'Abre el cuadro de diálogo de métodos abreviados de teclado',
             escape: 'Diálogos de escape',
             search: 'Abrir diálogo de búsqueda',
-            newGroup: 'Nueva pantalla de grupo',
+            newChat: 'Nueva pantalla de chat',
             copy: 'Copiar comentario',
         },
     },
@@ -2169,6 +2191,7 @@ export default {
     parentReportAction: {
         deletedMessage: '[Mensaje eliminado]',
         deletedRequest: '[Pedido eliminado]',
+        deletedTask: '[Tarea eliminado]',
         hiddenMessage: '[Mensaje oculto]',
     },
     threads: {
@@ -2247,15 +2270,4 @@ export default {
             selectSuggestedAddress: 'Por favor, selecciona una dirección sugerida',
         },
     },
-    demos: {
-        saastr: {
-            signInWelcome: '¡Bienvenido a SaaStr! Entra y empieza a establecer contactos.',
-            heroBody: 'Utiliza New Expensify para estar al día de los eventos, establecer contactos, charlar en las redes sociales, ¡y para que te devuelvan el dinero de la comida!',
-        },
-        sbe: {
-            signInWelcome: '¡Bienvenido a Small Business Expo! Recupera el dinero de tu viaje.',
-            heroBody:
-                'Utiliza New Expensify para estar al día de los eventos, establecer contactos, charlar en las redes sociales y para que te paguen el viaje de ida y vuelta a la conferencia.',
-        },
-    },
-};
+} 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 059d944fd4ba..52f2df8b3765 100644
--- a/src/languages/types.ts
+++ b/src/languages/types.ts
@@ -1,3 +1,5 @@
+import en from './en';
+
 type AddressLineParams = {
     lineNumber: number;
 };
@@ -98,10 +100,10 @@ type SettleExpensifyCardParams = {
     formattedAmount: string;
 };
 
-type SettlePaypalMeParams = {formattedAmount: string};
-
 type RequestAmountParams = {amount: number};
 
+type RequestedAmountMessageParams = {formattedAmount: string; comment: string};
+
 type SplitAmountParams = {amount: number};
 
 type AmountEachParams = {amount: number};
@@ -122,11 +124,9 @@ type WaitingOnBankAccountParams = {submitterDisplayName: string};
 
 type SettledAfterAddedBankAccountParams = {submitterDisplayName: string; amount: string};
 
-type PaidElsewhereWithAmountParams = {amount: string};
-
-type PaidUsingPaypalWithAmountParams = {amount: string};
+type PaidElsewhereWithAmountParams = {payer: string; amount: string};
 
-type PaidUsingExpensifyWithAmountParams = {amount: string};
+type PaidWithExpensifyWithAmountParams = {payer: string; amount: string};
 
 type ThreadRequestReportNameParams = {formattedAmount: string; comment: string};
 
@@ -190,7 +190,54 @@ type RemovedTheRequestParams = {valueName: string; oldValueToDisplay: string};
 
 type UpdatedTheRequestParams = {valueName: string; newValueToDisplay: string; oldValueToDisplay: string};
 
+type FormattedMaxLengthParams = {formattedMaxLength: string};
+
+type TagSelectionParams = {tagName: string};
+
+type WalletProgramParams = {walletProgram: 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,
@@ -215,8 +262,8 @@ export type {
     ReportArchiveReasonsPolicyDeletedParams,
     RequestCountParams,
     SettleExpensifyCardParams,
-    SettlePaypalMeParams,
     RequestAmountParams,
+    RequestedAmountMessageParams,
     SplitAmountParams,
     AmountEachParams,
     PayerOwesAmountParams,
@@ -228,8 +275,7 @@ export type {
     WaitingOnBankAccountParams,
     SettledAfterAddedBankAccountParams,
     PaidElsewhereWithAmountParams,
-    PaidUsingPaypalWithAmountParams,
-    PaidUsingExpensifyWithAmountParams,
+    PaidWithExpensifyWithAmountParams,
     ThreadRequestReportNameParams,
     ThreadSentMoneyReportNameParams,
     SizeExceededParams,
@@ -261,4 +307,7 @@ export type {
     SetTheRequestParams,
     UpdatedTheRequestParams,
     RemovedTheRequestParams,
+    FormattedMaxLengthParams,
+    TagSelectionParams,
+    WalletProgramParams,
 };
diff --git a/src/libs/Accessibility/index.js b/src/libs/Accessibility/index.ts
similarity index 74%
rename from src/libs/Accessibility/index.js
rename to src/libs/Accessibility/index.ts
index 59a6738dfb14..213d28139c2c 100644
--- a/src/libs/Accessibility/index.js
+++ b/src/libs/Accessibility/index.ts
@@ -1,25 +1,28 @@
 import {useEffect, useState, useCallback} from 'react';
-import {AccessibilityInfo} from 'react-native';
-import _ from 'underscore';
+import {AccessibilityInfo, LayoutChangeEvent} from 'react-native';
 import moveAccessibilityFocus from './moveAccessibilityFocus';
 
-const useScreenReaderStatus = () => {
+type HitSlop = {x: number; y: number};
+
+const useScreenReaderStatus = (): boolean => {
     const [isScreenReaderEnabled, setIsScreenReaderEnabled] = useState(false);
     useEffect(() => {
         const subscription = AccessibilityInfo.addEventListener('screenReaderChanged', setIsScreenReaderEnabled);
 
-        return subscription && subscription.remove;
+        return () => {
+            subscription?.remove();
+        };
     }, []);
 
     return isScreenReaderEnabled;
 };
 
-const getHitSlopForSize = ({x, y}) => {
+const getHitSlopForSize = ({x, y}: HitSlop) => {
     /* according to https://developer.apple.com/design/human-interface-guidelines/ios/visual-design/adaptivity-and-layout/
     the minimum tappable area is 44x44 points */
     const minimumSize = 44;
-    const hitSlopVertical = _.max([minimumSize - x, 0]) / 2;
-    const hitSlopHorizontal = _.max([minimumSize - y, 0]) / 2;
+    const hitSlopVertical = Math.max(minimumSize - x, 0) / 2;
+    const hitSlopHorizontal = Math.max(minimumSize - y, 0) / 2;
     return {
         top: hitSlopVertical,
         bottom: hitSlopVertical,
@@ -31,7 +34,7 @@ const getHitSlopForSize = ({x, y}) => {
 const useAutoHitSlop = () => {
     const [frameSize, setFrameSize] = useState({x: 0, y: 0});
     const onLayout = useCallback(
-        (event) => {
+        (event: LayoutChangeEvent) => {
             const {layout} = event.nativeEvent;
             if (layout.width !== frameSize.x && layout.height !== frameSize.y) {
                 setFrameSize({x: layout.width, y: layout.height});
diff --git a/src/libs/Accessibility/moveAccessibilityFocus/index.js b/src/libs/Accessibility/moveAccessibilityFocus/index.js
deleted file mode 100644
index c9130c7e34be..000000000000
--- a/src/libs/Accessibility/moveAccessibilityFocus/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const moveAccessibilityFocus = (ref) => {
-    if (!ref || !ref.current) {
-        return;
-    }
-    ref.current.focus();
-};
-
-export default moveAccessibilityFocus;
diff --git a/src/libs/Accessibility/moveAccessibilityFocus/index.native.js b/src/libs/Accessibility/moveAccessibilityFocus/index.native.ts
similarity index 62%
rename from src/libs/Accessibility/moveAccessibilityFocus/index.native.js
rename to src/libs/Accessibility/moveAccessibilityFocus/index.native.ts
index 91605e06243d..2e027c59be39 100644
--- a/src/libs/Accessibility/moveAccessibilityFocus/index.native.js
+++ b/src/libs/Accessibility/moveAccessibilityFocus/index.native.ts
@@ -1,9 +1,11 @@
 import {AccessibilityInfo} from 'react-native';
+import MoveAccessibilityFocus from './types';
 
-const moveAccessibilityFocus = (ref) => {
+const moveAccessibilityFocus: MoveAccessibilityFocus = (ref) => {
     if (!ref) {
         return;
     }
+
     AccessibilityInfo.sendAccessibilityEvent(ref, 'focus');
 };
 
diff --git a/src/libs/Accessibility/moveAccessibilityFocus/index.ts b/src/libs/Accessibility/moveAccessibilityFocus/index.ts
new file mode 100644
index 000000000000..b381c1d814c1
--- /dev/null
+++ b/src/libs/Accessibility/moveAccessibilityFocus/index.ts
@@ -0,0 +1,10 @@
+import MoveAccessibilityFocus from './types';
+
+const moveAccessibilityFocus: MoveAccessibilityFocus = (ref) => {
+    if (!ref?.current) {
+        return;
+    }
+    ref.current.focus();
+};
+
+export default moveAccessibilityFocus;
diff --git a/src/libs/Accessibility/moveAccessibilityFocus/types.ts b/src/libs/Accessibility/moveAccessibilityFocus/types.ts
new file mode 100644
index 000000000000..1344c3f98e3e
--- /dev/null
+++ b/src/libs/Accessibility/moveAccessibilityFocus/types.ts
@@ -0,0 +1,6 @@
+import {ElementRef, RefObject} from 'react';
+import {HostComponent} from 'react-native';
+
+type MoveAccessibilityFocus = (ref?: ElementRef<HostComponent<unknown>> & RefObject<HTMLOrSVGElement>) => void;
+
+export default MoveAccessibilityFocus;
diff --git a/src/libs/AppStateMonitor/index.js b/src/libs/AppStateMonitor/index.ts
similarity index 71%
rename from src/libs/AppStateMonitor/index.js
rename to src/libs/AppStateMonitor/index.ts
index 12370382919e..5c206579944d 100644
--- a/src/libs/AppStateMonitor/index.js
+++ b/src/libs/AppStateMonitor/index.ts
@@ -1,20 +1,15 @@
-import {AppState} from 'react-native';
+import {AppState, AppStateStatus} from 'react-native';
 import CONST from '../../CONST';
 import shouldReportActivity from './shouldReportActivity';
 
-let appState = CONST.APP_STATE.ACTIVE;
+let appState: AppStateStatus = CONST.APP_STATE.ACTIVE;
 
 /**
  * Listener that will only fire the callback when the user has become active.
- *
- * @param {Function} callback
- * @returns {Function} to unsubscribe
+ * @returns callback to unsubscribe
  */
-function addBecameActiveListener(callback) {
-    /**
-     * @param {String} state
-     */
-    function appStateChangeCallback(state) {
+function addBecameActiveListener(callback: () => void): () => void {
+    function appStateChangeCallback(state: AppStateStatus) {
         if (shouldReportActivity && (appState === CONST.APP_STATE.INACTIVE || appState === CONST.APP_STATE.BACKGROUND) && state === CONST.APP_STATE.ACTIVE) {
             callback();
         }
diff --git a/src/libs/AppStateMonitor/shouldReportActivity/index.native.js b/src/libs/AppStateMonitor/shouldReportActivity/index.native.js
deleted file mode 100644
index ff3177babdde..000000000000
--- a/src/libs/AppStateMonitor/shouldReportActivity/index.native.js
+++ /dev/null
@@ -1 +0,0 @@
-export default true;
diff --git a/src/libs/AppStateMonitor/shouldReportActivity/index.native.ts b/src/libs/AppStateMonitor/shouldReportActivity/index.native.ts
new file mode 100644
index 000000000000..0e5fdb57a597
--- /dev/null
+++ b/src/libs/AppStateMonitor/shouldReportActivity/index.native.ts
@@ -0,0 +1,5 @@
+import ShouldReportActivity from './types';
+
+const shouldReportActivity: ShouldReportActivity = true;
+
+export default shouldReportActivity;
diff --git a/src/libs/AppStateMonitor/shouldReportActivity/index.js b/src/libs/AppStateMonitor/shouldReportActivity/index.ts
similarity index 70%
rename from src/libs/AppStateMonitor/shouldReportActivity/index.js
rename to src/libs/AppStateMonitor/shouldReportActivity/index.ts
index 05939ab7eb8d..db326345714e 100644
--- a/src/libs/AppStateMonitor/shouldReportActivity/index.js
+++ b/src/libs/AppStateMonitor/shouldReportActivity/index.ts
@@ -1,4 +1,8 @@
+import ShouldReportActivity from './types';
+
 // We only need to report when the app becomes active on native since web maintains most of it's network functions while
 // in the "background" and the concept is not quite the same on mobile. We avoid setting this to true for web since
 // the event would fire much more frequently than it does on native causing performance issues.
-export default false;
+const shouldReportActivity: ShouldReportActivity = false;
+
+export default shouldReportActivity;
diff --git a/src/libs/AppStateMonitor/shouldReportActivity/types.ts b/src/libs/AppStateMonitor/shouldReportActivity/types.ts
new file mode 100644
index 000000000000..2341c0d5cbf1
--- /dev/null
+++ b/src/libs/AppStateMonitor/shouldReportActivity/types.ts
@@ -0,0 +1,3 @@
+type ShouldReportActivity = boolean;
+
+export default ShouldReportActivity;
diff --git a/src/libs/BootSplash/index.native.js b/src/libs/BootSplash/index.native.ts
similarity index 91%
rename from src/libs/BootSplash/index.native.js
rename to src/libs/BootSplash/index.native.ts
index 942b3cadb74a..0790b4de89bc 100644
--- a/src/libs/BootSplash/index.native.js
+++ b/src/libs/BootSplash/index.native.ts
@@ -3,7 +3,7 @@ import Log from '../Log';
 
 const BootSplash = NativeModules.BootSplash;
 
-function hide() {
+function hide(): Promise<void> {
     Log.info('[BootSplash] hiding splash screen', false);
     return BootSplash.hide();
 }
diff --git a/src/libs/BootSplash/index.js b/src/libs/BootSplash/index.ts
similarity index 54%
rename from src/libs/BootSplash/index.js
rename to src/libs/BootSplash/index.ts
index ff7ab5562b1f..24842fe631f4 100644
--- a/src/libs/BootSplash/index.js
+++ b/src/libs/BootSplash/index.ts
@@ -1,24 +1,29 @@
 import Log from '../Log';
+import {VisibilityStatus} from './types';
 
-function resolveAfter(delay) {
-    return new Promise((resolve) => setTimeout(resolve, delay));
+function resolveAfter(delay: number): Promise<void> {
+    return new Promise<void>((resolve) => setTimeout(resolve, delay));
 }
 
-function hide() {
+function hide(): Promise<void> {
     Log.info('[BootSplash] hiding splash screen', false);
 
     return document.fonts.ready.then(() => {
         const splash = document.getElementById('splash');
-        if (splash) splash.style.opacity = 0;
+        if (splash) {
+            splash.style.opacity = '0';
+        }
 
         return resolveAfter(250).then(() => {
-            if (!splash || !splash.parentNode) return;
+            if (!splash?.parentNode) {
+                return;
+            }
             splash.parentNode.removeChild(splash);
         });
     });
 }
 
-function getVisibilityStatus() {
+function getVisibilityStatus(): Promise<VisibilityStatus> {
     return Promise.resolve(document.getElementById('splash') ? 'visible' : 'hidden');
 }
 
diff --git a/src/libs/BootSplash/types.ts b/src/libs/BootSplash/types.ts
new file mode 100644
index 000000000000..2329d5315817
--- /dev/null
+++ b/src/libs/BootSplash/types.ts
@@ -0,0 +1,9 @@
+type VisibilityStatus = 'visible' | 'hidden';
+
+type BootSplashModule = {
+    navigationBarHeight: number;
+    hide: () => Promise<void>;
+    getVisibilityStatus: () => Promise<VisibilityStatus>;
+};
+
+export type {BootSplashModule, VisibilityStatus};
diff --git a/src/libs/Browser/index.js b/src/libs/Browser/index.ts
similarity index 100%
rename from src/libs/Browser/index.js
rename to src/libs/Browser/index.ts
diff --git a/src/libs/Browser/index.web.js b/src/libs/Browser/index.web.ts
similarity index 88%
rename from src/libs/Browser/index.web.js
rename to src/libs/Browser/index.web.ts
index 32f6392aef76..064358c6bed5 100644
--- a/src/libs/Browser/index.web.js
+++ b/src/libs/Browser/index.web.ts
@@ -5,12 +5,12 @@ import ROUTES from '../../ROUTES';
 /**
  * Fetch browser name from UA string
  *
- * @return {String} e.g. Chrome
  */
-function getBrowser() {
+function getBrowser(): string {
     const {userAgent} = window.navigator;
-    let match = userAgent.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))/i) || [];
-    let temp;
+    const match = userAgent.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))/i) ?? [];
+    let temp: RegExpMatchArray | null;
+    let browserName = '';
 
     if (/trident/i.test(match[1])) {
         return 'IE';
@@ -28,15 +28,14 @@ function getBrowser() {
         }
     }
 
-    match = match[1] ? match[1] : navigator.appName;
-    return match ? match.toLowerCase() : CONST.BROWSER.OTHER;
+    browserName = match[1] ?? navigator.appName;
+    return browserName ? browserName.toLowerCase() : CONST.BROWSER.OTHER;
 }
 
 /**
  * Whether the platform is a mobile browser.
  * https://developer.mozilla.org/en-US/docs/Web/HTTP/Browser_detection_using_the_user_agent
  *
- * @returns {Boolean}
  */
 function isMobile() {
     return /Android|webOS|iPhone|iPad|iPod|BlackBerry|BB|PlayBook|IEMobile|Windows Phone|Silk|Opera Mini/i.test(navigator.userAgent);
@@ -45,7 +44,6 @@ function isMobile() {
 /**
  * Checks if requesting user agent is Safari browser on a mobile device
  *
- * @returns {Boolean}
  */
 function isMobileSafari() {
     const userAgent = navigator.userAgent;
@@ -55,7 +53,6 @@ function isMobileSafari() {
 /**
  * Checks if requesting user agent is Chrome browser on a mobile device
  *
- * @returns {Boolean}
  */
 function isMobileChrome() {
     const userAgent = navigator.userAgent;
@@ -68,8 +65,6 @@ function isSafari() {
 
 /**
  * The session information needs to be passed to the Desktop app, and the only way to do that is by using query params. There is no other way to transfer the data.
- * @param {String} shortLivedAuthToken
- * @param {String} email
  */
 function openRouteInDesktopApp(shortLivedAuthToken = '', email = '') {
     const params = new URLSearchParams();
@@ -95,8 +90,9 @@ function openRouteInDesktopApp(shortLivedAuthToken = '', email = '') {
         const iframe = document.createElement('iframe');
         iframe.style.display = 'none';
         document.body.appendChild(iframe);
-        iframe.contentWindow.location.href = expensifyDeeplinkUrl;
-
+        if (iframe.contentWindow) {
+            iframe.contentWindow.location.href = expensifyDeeplinkUrl;
+        }
         // Since we're creating an iframe for Safari to handle deeplink,
         // we need to give Safari some time to open the pop-up window.
         // After that we can just remove the iframe.
diff --git a/src/libs/CardUtils.ts b/src/libs/CardUtils.ts
index bbb938a666ac..30bb17f3db52 100644
--- a/src/libs/CardUtils.ts
+++ b/src/libs/CardUtils.ts
@@ -1,3 +1,8 @@
+import lodash from 'lodash';
+import {Card} from '../types/onyx';
+import CONST from '../CONST';
+import * as OnyxTypes from '../types/onyx';
+
 /**
  * @returns string with a month in MM format
  */
@@ -15,4 +20,40 @@ function getYearFromExpirationDateString(expirationDateString: string) {
     return cardYear.length === 2 ? `20${cardYear}` : cardYear;
 }
 
-export {getMonthFromExpirationDateString, getYearFromExpirationDateString};
+function getCompanyCards(cardList: {string: Card}) {
+    if (!cardList) {
+        return [];
+    }
+    return Object.values(cardList).filter((card) => card.bank !== CONST.EXPENSIFY_CARD.BANK);
+}
+
+/**
+ * @param cardList - collection of assigned cards
+ * @returns collection of assigned cards grouped by domain
+ */
+function getDomainCards(cardList: Record<string, OnyxTypes.Card>) {
+    // eslint-disable-next-line you-dont-need-lodash-underscore/filter
+    const activeCards = lodash.filter(cardList, (card) => [2, 3, 4, 7].includes(card.state));
+    return lodash.groupBy(activeCards, (card) => card.domainName.toLowerCase());
+}
+
+/**
+ * Returns a masked credit card string with spaces for every four symbols.
+ * If the last four digits are provided, all preceding digits will be masked.
+ * If not, the entire card string will be masked.
+ *
+ * @param [lastFour=""] - The last four digits of the card (optional).
+ * @returns - The masked card string.
+ */
+function maskCard(lastFour = ''): string {
+    const totalDigits = 16;
+    const maskedLength = totalDigits - lastFour.length;
+
+    // Create a string with '•' repeated for the masked portion
+    const maskedString = '•'.repeat(maskedLength) + lastFour;
+
+    // Insert space for every four symbols
+    return maskedString.replace(/(.{4})/g, '$1 ').trim();
+}
+
+export {getDomainCards, getCompanyCards, getMonthFromExpirationDateString, getYearFromExpirationDateString, maskCard};
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/ComposerUtils/debouncedSaveReportComment.js b/src/libs/ComposerUtils/debouncedSaveReportComment.js
deleted file mode 100644
index c39da78c2c3e..000000000000
--- a/src/libs/ComposerUtils/debouncedSaveReportComment.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import _ from 'underscore';
-import * as Report from '../actions/Report';
-
-/**
- * Save draft report comment. Debounced to happen at most once per second.
- * @param {String} reportID
- * @param {String} comment
- */
-const debouncedSaveReportComment = _.debounce((reportID, comment) => {
-    Report.saveReportComment(reportID, comment || '');
-}, 1000);
-
-export default debouncedSaveReportComment;
diff --git a/src/libs/ComposerUtils/debouncedSaveReportComment.ts b/src/libs/ComposerUtils/debouncedSaveReportComment.ts
new file mode 100644
index 000000000000..e449245edc52
--- /dev/null
+++ b/src/libs/ComposerUtils/debouncedSaveReportComment.ts
@@ -0,0 +1,11 @@
+import debounce from 'lodash/debounce';
+import * as Report from '../actions/Report';
+
+/**
+ * Save draft report comment. Debounced to happen at most once per second.
+ */
+const debouncedSaveReportComment = debounce((reportID: string, comment = '') => {
+    Report.saveReportComment(reportID, comment);
+}, 1000);
+
+export default debouncedSaveReportComment;
diff --git a/src/libs/ComposerUtils/getDraftComment.js b/src/libs/ComposerUtils/getDraftComment.ts
similarity index 69%
rename from src/libs/ComposerUtils/getDraftComment.js
rename to src/libs/ComposerUtils/getDraftComment.ts
index ddcb966bb2a7..ac3d2f3d09be 100644
--- a/src/libs/ComposerUtils/getDraftComment.js
+++ b/src/libs/ComposerUtils/getDraftComment.ts
@@ -1,11 +1,13 @@
-import Onyx from 'react-native-onyx';
+import Onyx, {OnyxEntry} from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 
-const draftCommentMap = {};
+const draftCommentMap: Record<string, OnyxEntry<string>> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT,
     callback: (value, key) => {
-        if (!key) return;
+        if (!key) {
+            return;
+        }
 
         const reportID = key.replace(ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT, '');
         draftCommentMap[reportID] = value;
@@ -16,9 +18,7 @@ Onyx.connect({
  * Returns a draft comment from the onyx collection.
  * Note: You should use the HOCs/hooks to get onyx data, instead of using this directly.
  * A valid use case to use this is if the value is only needed once for an initial value.
- * @param {String} reportID
- * @returns {String|undefined}
  */
-export default function getDraftComment(reportID) {
+export default function getDraftComment(reportID: string): OnyxEntry<string> {
     return draftCommentMap[reportID];
 }
diff --git a/src/libs/ComposerUtils/getNumberOfLines/index.native.js b/src/libs/ComposerUtils/getNumberOfLines/index.native.js
deleted file mode 100644
index ff4a1c6d74b1..000000000000
--- a/src/libs/ComposerUtils/getNumberOfLines/index.native.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Get the current number of lines in the composer
- *
- * @param {Number} lineHeight
- * @param {Number} paddingTopAndBottom
- * @param {Number} scrollHeight
- *
- * @returns {Number}
- */
-function getNumberOfLines(lineHeight, paddingTopAndBottom, scrollHeight) {
-    return Math.ceil((scrollHeight - paddingTopAndBottom) / lineHeight);
-}
-
-export default getNumberOfLines;
diff --git a/src/libs/ComposerUtils/getNumberOfLines/index.native.ts b/src/libs/ComposerUtils/getNumberOfLines/index.native.ts
new file mode 100644
index 000000000000..9a7340b9a035
--- /dev/null
+++ b/src/libs/ComposerUtils/getNumberOfLines/index.native.ts
@@ -0,0 +1,8 @@
+import GetNumberOfLines from './types';
+
+/**
+ * Get the current number of lines in the composer
+ */
+const getNumberOfLines: GetNumberOfLines = (lineHeight, paddingTopAndBottom, scrollHeight) => Math.ceil((scrollHeight - paddingTopAndBottom) / lineHeight);
+
+export default getNumberOfLines;
diff --git a/src/libs/ComposerUtils/getNumberOfLines/index.js b/src/libs/ComposerUtils/getNumberOfLines/index.ts
similarity index 55%
rename from src/libs/ComposerUtils/getNumberOfLines/index.js
rename to src/libs/ComposerUtils/getNumberOfLines/index.ts
index a469da7516bb..cf85b45443d5 100644
--- a/src/libs/ComposerUtils/getNumberOfLines/index.js
+++ b/src/libs/ComposerUtils/getNumberOfLines/index.ts
@@ -1,17 +1,12 @@
+import GetNumberOfLines from './types';
+
 /**
  * Get the current number of lines in the composer
- *
- * @param {Number} maxLines
- * @param {Number} lineHeight
- * @param {Number} paddingTopAndBottom
- * @param {Number} scrollHeight
- *
- * @returns {Number}
  */
-function getNumberOfLines(maxLines, lineHeight, paddingTopAndBottom, scrollHeight) {
+const getNumberOfLines: GetNumberOfLines = (lineHeight, paddingTopAndBottom, scrollHeight, maxLines = 0) => {
     let newNumberOfLines = Math.ceil((scrollHeight - paddingTopAndBottom) / lineHeight);
     newNumberOfLines = maxLines <= 0 ? newNumberOfLines : Math.min(newNumberOfLines, maxLines);
     return newNumberOfLines;
-}
+};
 
 export default getNumberOfLines;
diff --git a/src/libs/ComposerUtils/getNumberOfLines/types.ts b/src/libs/ComposerUtils/getNumberOfLines/types.ts
new file mode 100644
index 000000000000..67bb790f726b
--- /dev/null
+++ b/src/libs/ComposerUtils/getNumberOfLines/types.ts
@@ -0,0 +1,3 @@
+type GetNumberOfLines = (lineHeight: number, paddingTopAndBottom: number, scrollHeight: number, maxLines?: number) => number;
+
+export default GetNumberOfLines;
diff --git a/src/libs/ComposerUtils/index.js b/src/libs/ComposerUtils/index.ts
similarity index 69%
rename from src/libs/ComposerUtils/index.js
rename to src/libs/ComposerUtils/index.ts
index dfe6cf446809..5e2a42fc65dd 100644
--- a/src/libs/ComposerUtils/index.js
+++ b/src/libs/ComposerUtils/index.ts
@@ -2,24 +2,22 @@ import getNumberOfLines from './getNumberOfLines';
 import updateNumberOfLines from './updateNumberOfLines';
 import * as DeviceCapabilities from '../DeviceCapabilities';
 
+type Selection = {
+    start: number;
+    end: number;
+};
+
 /**
  * Replace substring between selection with a text.
- * @param {String} text
- * @param {Object} selection
- * @param {String} textToInsert
- * @returns {String}
  */
-function insertText(text, selection, textToInsert) {
+function insertText(text: string, selection: Selection, textToInsert: string): string {
     return text.slice(0, selection.start) + textToInsert + text.slice(selection.end, text.length);
 }
 
 /**
  * Check whether we can skip trigger hotkeys on some specific devices.
- * @param {Boolean} isSmallScreenWidth
- * @param {Boolean} isKeyboardShown
- * @returns {Boolean}
  */
-function canSkipTriggerHotkeys(isSmallScreenWidth, isKeyboardShown) {
+function canSkipTriggerHotkeys(isSmallScreenWidth: boolean, isKeyboardShown: boolean): boolean {
     // Do not trigger actions for mobileWeb or native clients that have the keyboard open
     // because for those devices, we want the return key to insert newlines rather than submit the form
     return (isSmallScreenWidth && DeviceCapabilities.canUseTouchScreen()) || isKeyboardShown;
@@ -30,11 +28,9 @@ function canSkipTriggerHotkeys(isSmallScreenWidth, isKeyboardShown) {
  * The common suffix is the number of characters shared by both strings
  * at the end (suffix) until a mismatch is encountered.
  *
- * @param {string} str1
- * @param {string} str2
- * @returns {number} The length of the common suffix between the strings.
+ * @returns The length of the common suffix between the strings.
  */
-function getCommonSuffixLength(str1, str2) {
+function getCommonSuffixLength(str1: string, str2: string): number {
     let i = 0;
     while (str1[str1.length - 1 - i] === str2[str2.length - 1 - i]) {
         i++;
diff --git a/src/libs/ComposerUtils/types.ts b/src/libs/ComposerUtils/types.ts
new file mode 100644
index 000000000000..a417d951ff51
--- /dev/null
+++ b/src/libs/ComposerUtils/types.ts
@@ -0,0 +1,6 @@
+type ComposerProps = {
+    isFullComposerAvailable: boolean;
+    setIsFullComposerAvailable: (isFullComposerAvailable: boolean) => void;
+};
+
+export default ComposerProps;
diff --git a/src/libs/ComposerUtils/updateIsFullComposerAvailable.js b/src/libs/ComposerUtils/updateIsFullComposerAvailable.ts
similarity index 66%
rename from src/libs/ComposerUtils/updateIsFullComposerAvailable.js
rename to src/libs/ComposerUtils/updateIsFullComposerAvailable.ts
index 00b12d1742e3..5d73619482db 100644
--- a/src/libs/ComposerUtils/updateIsFullComposerAvailable.js
+++ b/src/libs/ComposerUtils/updateIsFullComposerAvailable.ts
@@ -1,11 +1,11 @@
 import CONST from '../../CONST';
+import ComposerProps from './types';
 
 /**
  * Update isFullComposerAvailable if needed
- * @param {Object} props
- * @param {Number} numberOfLines The number of lines in the text input
+ * @param numberOfLines The number of lines in the text input
  */
-function updateIsFullComposerAvailable(props, numberOfLines) {
+function updateIsFullComposerAvailable(props: ComposerProps, numberOfLines: number) {
     const isFullComposerAvailable = numberOfLines >= CONST.COMPOSER.FULL_COMPOSER_MIN_LINES;
     if (isFullComposerAvailable !== props.isFullComposerAvailable) {
         props.setIsFullComposerAvailable(isFullComposerAvailable);
diff --git a/src/libs/ComposerUtils/updateNumberOfLines/index.native.js b/src/libs/ComposerUtils/updateNumberOfLines/index.native.ts
similarity index 77%
rename from src/libs/ComposerUtils/updateNumberOfLines/index.native.js
rename to src/libs/ComposerUtils/updateNumberOfLines/index.native.ts
index 5a13ae670d81..b22135b4f767 100644
--- a/src/libs/ComposerUtils/updateNumberOfLines/index.native.js
+++ b/src/libs/ComposerUtils/updateNumberOfLines/index.native.ts
@@ -1,23 +1,21 @@
-import lodashGet from 'lodash/get';
 import styles from '../../../styles/styles';
 import updateIsFullComposerAvailable from '../updateIsFullComposerAvailable';
 import getNumberOfLines from '../getNumberOfLines';
+import UpdateNumberOfLines from './types';
 
 /**
  * Check the current scrollHeight of the textarea (minus any padding) and
  * divide by line height to get the total number of rows for the textarea.
- * @param {Object} props
- * @param {Event} e
  */
-function updateNumberOfLines(props, e) {
+const updateNumberOfLines: UpdateNumberOfLines = (props, event) => {
     const lineHeight = styles.textInputCompose.lineHeight;
     const paddingTopAndBottom = styles.textInputComposeSpacing.paddingVertical * 2;
-    const inputHeight = lodashGet(e, 'nativeEvent.contentSize.height', null);
+    const inputHeight = event?.nativeEvent?.contentSize?.height ?? null;
     if (!inputHeight) {
         return;
     }
     const numberOfLines = getNumberOfLines(lineHeight, paddingTopAndBottom, inputHeight);
     updateIsFullComposerAvailable(props, numberOfLines);
-}
+};
 
 export default updateNumberOfLines;
diff --git a/src/libs/ComposerUtils/updateNumberOfLines/index.ts b/src/libs/ComposerUtils/updateNumberOfLines/index.ts
new file mode 100644
index 000000000000..91a9c9c0f102
--- /dev/null
+++ b/src/libs/ComposerUtils/updateNumberOfLines/index.ts
@@ -0,0 +1,5 @@
+import UpdateNumberOfLines from './types';
+
+const updateNumberOfLines: UpdateNumberOfLines = () => {};
+
+export default updateNumberOfLines;
diff --git a/src/libs/ComposerUtils/updateNumberOfLines/types.ts b/src/libs/ComposerUtils/updateNumberOfLines/types.ts
new file mode 100644
index 000000000000..c0650be25433
--- /dev/null
+++ b/src/libs/ComposerUtils/updateNumberOfLines/types.ts
@@ -0,0 +1,6 @@
+import {NativeSyntheticEvent, TextInputContentSizeChangeEventData} from 'react-native';
+import ComposerProps from '../types';
+
+type UpdateNumberOfLines = (props: ComposerProps, event: NativeSyntheticEvent<TextInputContentSizeChangeEventData>) => void;
+
+export default UpdateNumberOfLines;
diff --git a/src/libs/CurrencyUtils.js b/src/libs/CurrencyUtils.ts
similarity index 62%
rename from src/libs/CurrencyUtils.js
rename to src/libs/CurrencyUtils.ts
index 6cbb0db7661b..21784d450a07 100644
--- a/src/libs/CurrencyUtils.js
+++ b/src/libs/CurrencyUtils.ts
@@ -1,16 +1,15 @@
-import _ from 'underscore';
-import lodashGet from 'lodash/get';
 import Onyx from 'react-native-onyx';
-import ONYXKEYS from '../ONYXKEYS';
+import ONYXKEYS, {OnyxValues} from '../ONYXKEYS';
 import CONST from '../CONST';
 import BaseLocaleListener from './Localize/LocaleListener/BaseLocaleListener';
 import * as NumberFormatUtils from './NumberFormatUtils';
 
-let currencyList = {};
+let currencyList: OnyxValues[typeof ONYXKEYS.CURRENCY_LIST] = {};
+
 Onyx.connect({
     key: ONYXKEYS.CURRENCY_LIST,
     callback: (val) => {
-        if (_.isEmpty(val)) {
+        if (!val || Object.keys(val).length === 0) {
             return;
         }
 
@@ -23,56 +22,45 @@ Onyx.connect({
  * For currencies that have decimal places > 2, floor to 2 instead:
  * https://github.com/Expensify/App/issues/15878#issuecomment-1496291464
  *
- * @param {String} currency - IOU currency
- * @returns {Number}
+ * @param currency - IOU currency
  */
-function getCurrencyDecimals(currency = CONST.CURRENCY.USD) {
-    const decimals = lodashGet(currencyList, [currency, 'decimals']);
-    return _.isUndefined(decimals) ? 2 : decimals;
+function getCurrencyDecimals(currency: string = CONST.CURRENCY.USD): number {
+    const decimals = currencyList?.[currency]?.decimals;
+    return decimals ?? 2;
 }
 
 /**
  * Returns the currency's minor unit quantity
  * e.g. Cent in USD
  *
- * @param {String} currency - IOU currency
- * @returns {Number}
+ * @param currency - IOU currency
  */
-function getCurrencyUnit(currency = CONST.CURRENCY.USD) {
+function getCurrencyUnit(currency: string = CONST.CURRENCY.USD): number {
     return 10 ** getCurrencyDecimals(currency);
 }
 
 /**
  * Get localized currency symbol for currency(ISO 4217) Code
- *
- * @param {String} currencyCode
- * @returns {String}
  */
-function getLocalizedCurrencySymbol(currencyCode) {
+function getLocalizedCurrencySymbol(currencyCode: string): string | undefined {
     const parts = NumberFormatUtils.formatToParts(BaseLocaleListener.getPreferredLocale(), 0, {
         style: 'currency',
         currency: currencyCode,
     });
-    return _.find(parts, (part) => part.type === 'currency').value;
+    return parts.find((part) => part.type === 'currency')?.value;
 }
 
 /**
  * Get the currency symbol for a currency(ISO 4217) Code
- *
- * @param {String} currencyCode
- * @returns {String|undefined}
  */
-function getCurrencySymbol(currencyCode) {
-    return lodashGet(currencyList, [currencyCode, 'symbol']);
+function getCurrencySymbol(currencyCode: string): string | undefined {
+    return currencyList?.[currencyCode]?.symbol;
 }
 
 /**
  * Whether the currency symbol is left-to-right.
- *
- * @param {String} currencyCode
- * @returns {Boolean}
  */
-function isCurrencySymbolLTR(currencyCode) {
+function isCurrencySymbolLTR(currencyCode: string): boolean {
     const parts = NumberFormatUtils.formatToParts(BaseLocaleListener.getPreferredLocale(), 0, {
         style: 'currency',
         currency: currencyCode,
@@ -88,11 +76,8 @@ function isCurrencySymbolLTR(currencyCode) {
  * when doing math operations.
  *
  * @note we do not currently support any currencies with more than two decimal places. Decimal past the second place will be rounded. Sorry Tunisia :(
- *
- * @param {Number} amountAsFloat
- * @returns {Number}
  */
-function convertToBackendAmount(amountAsFloat) {
+function convertToBackendAmount(amountAsFloat: number): number {
     return Math.round(amountAsFloat * 100);
 }
 
@@ -100,11 +85,8 @@ function convertToBackendAmount(amountAsFloat) {
  * Takes an amount in "cents" as an integer and converts it to a floating point amount used in the frontend.
  *
  * @note we do not support any currencies with more than two decimal places.
- *
- * @param {Number} amountAsInt
- * @returns {Number}
  */
-function convertToFrontendAmount(amountAsInt) {
+function convertToFrontendAmount(amountAsInt: number): number {
     return Math.trunc(amountAsInt) / 100.0;
 }
 
@@ -112,11 +94,10 @@ function convertToFrontendAmount(amountAsInt) {
  * Given an amount in the "cents", convert it to a string for display in the UI.
  * The backend always handle things in "cents" (subunit equal to 1/100)
  *
- * @param {Number} amountInCents – should be an integer. Anything after a decimal place will be dropped.
- * @param {String} currency
- * @returns {String}
+ * @param amountInCents – should be an integer. Anything after a decimal place will be dropped.
+ * @param currency - IOU currency
  */
-function convertToDisplayString(amountInCents, currency = CONST.CURRENCY.USD) {
+function convertToDisplayString(amountInCents: number, currency: string = CONST.CURRENCY.USD): string {
     const convertedAmount = convertToFrontendAmount(amountInCents);
     return NumberFormatUtils.format(BaseLocaleListener.getPreferredLocale(), convertedAmount, {
         style: 'currency',
@@ -128,4 +109,22 @@ function convertToDisplayString(amountInCents, currency = CONST.CURRENCY.USD) {
     });
 }
 
-export {getCurrencyDecimals, getCurrencyUnit, getLocalizedCurrencySymbol, getCurrencySymbol, isCurrencySymbolLTR, convertToBackendAmount, convertToFrontendAmount, convertToDisplayString};
+/**
+ * Checks if passed currency code is a valid currency based on currency list
+ */
+function isValidCurrencyCode(currencyCode: string): boolean {
+    const currency = currencyList?.[currencyCode];
+    return Boolean(currency);
+}
+
+export {
+    getCurrencyDecimals,
+    getCurrencyUnit,
+    getLocalizedCurrencySymbol,
+    getCurrencySymbol,
+    isCurrencySymbolLTR,
+    convertToBackendAmount,
+    convertToFrontendAmount,
+    convertToDisplayString,
+    isValidCurrencyCode,
+};
diff --git a/src/libs/DateUtils.js b/src/libs/DateUtils.js
index b33a1b1b2a73..a9ec4a3fd35a 100644
--- a/src/libs/DateUtils.js
+++ b/src/libs/DateUtils.js
@@ -4,11 +4,10 @@ import {es, enGB} from 'date-fns/locale';
 import {
     formatDistanceToNow,
     subMinutes,
+    addDays,
+    subDays,
     isBefore,
     subMilliseconds,
-    isToday,
-    isTomorrow,
-    isYesterday,
     startOfWeek,
     endOfWeek,
     format,
@@ -85,6 +84,47 @@ function getLocalDateFromDatetime(locale, datetime, currentSelectedTimezone = ti
     return utcToZonedTime(parsedDatetime, currentSelectedTimezone);
 }
 
+/**
+ * Checks if a given date is today in the specified time zone.
+ *
+ * @param {Date} date - The date to compare.
+ * @param {String} timeZone - The time zone to consider.
+ * @returns {Boolean} True if the date is today; otherwise, false.
+ */
+function isToday(date, timeZone) {
+    const currentDate = new Date();
+    const currentDateInTimeZone = utcToZonedTime(currentDate, timeZone);
+    return isSameDay(date, currentDateInTimeZone);
+}
+
+/**
+ * Checks if a given date is tomorrow in the specified time zone.
+ *
+ * @param {Date} date - The date to compare.
+ * @param {String} timeZone - The time zone to consider.
+ * @returns {Boolean} True if the date is tomorrow; otherwise, false.
+ */
+function isTomorrow(date, timeZone) {
+    const currentDate = new Date();
+    const tomorrow = addDays(currentDate, 1); // Get the date for tomorrow in the current time zone
+    const tomorrowInTimeZone = utcToZonedTime(tomorrow, timeZone);
+    return isSameDay(date, tomorrowInTimeZone);
+}
+
+/**
+ * Checks if a given date is yesterday in the specified time zone.
+ *
+ * @param {Date} date - The date to compare.
+ * @param {String} timeZone - The time zone to consider.
+ * @returns {Boolean} True if the date is yesterday; otherwise, false.
+ */
+function isYesterday(date, timeZone) {
+    const currentDate = new Date();
+    const yesterday = subDays(currentDate, 1); // Get the date for yesterday in the current time zone
+    const yesterdayInTimeZone = utcToZonedTime(yesterday, timeZone);
+    return isSameDay(date, yesterdayInTimeZone);
+}
+
 /**
  * Formats an ISO-formatted datetime string to local date and time string
  *
@@ -117,13 +157,13 @@ function datetimeToCalendarTime(locale, datetime, includeTimeZone = false, curre
         yesterdayAt = yesterdayAt.toLowerCase();
     }
 
-    if (isToday(date)) {
+    if (isToday(date, currentSelectedTimezone)) {
         return `${todayAt} ${format(date, CONST.DATE.LOCAL_TIME_FORMAT)}${tz}`;
     }
-    if (isTomorrow(date)) {
+    if (isTomorrow(date, currentSelectedTimezone)) {
         return `${tomorrowAt} ${format(date, CONST.DATE.LOCAL_TIME_FORMAT)}${tz}`;
     }
-    if (isYesterday(date)) {
+    if (isYesterday(date, currentSelectedTimezone)) {
         return `${yesterdayAt} ${format(date, CONST.DATE.LOCAL_TIME_FORMAT)}${tz}`;
     }
     if (date >= startOfCurrentWeek && date <= endOfCurrentWeek) {
@@ -298,7 +338,9 @@ function getDateStringFromISOTimestamp(isoTimestamp) {
  * @returns {String}
  */
 function getStatusUntilDate(inputDate) {
-    if (!inputDate) return '';
+    if (!inputDate) {
+        return '';
+    }
     const {translateLocal} = Localize;
 
     const input = new Date(inputDate);
@@ -344,6 +386,10 @@ const DateUtils = {
     subtractMillisecondsFromDateTime,
     getDateStringFromISOTimestamp,
     getStatusUntilDate,
+    setLocale,
+    isToday,
+    isTomorrow,
+    isYesterday,
 };
 
 export default DateUtils;
diff --git a/src/libs/DeviceCapabilities/canUseTouchScreen/index.native.js b/src/libs/DeviceCapabilities/canUseTouchScreen/index.native.js
deleted file mode 100644
index 4306b0cff3f6..000000000000
--- a/src/libs/DeviceCapabilities/canUseTouchScreen/index.native.js
+++ /dev/null
@@ -1,5 +0,0 @@
-function canUseTouchScreen() {
-    return true;
-}
-
-export default canUseTouchScreen;
diff --git a/src/libs/DeviceCapabilities/canUseTouchScreen/index.native.ts b/src/libs/DeviceCapabilities/canUseTouchScreen/index.native.ts
new file mode 100644
index 000000000000..60980801e73c
--- /dev/null
+++ b/src/libs/DeviceCapabilities/canUseTouchScreen/index.native.ts
@@ -0,0 +1,5 @@
+import CanUseTouchScreen from './types';
+
+const canUseTouchScreen: CanUseTouchScreen = () => true;
+
+export default canUseTouchScreen;
diff --git a/src/libs/DeviceCapabilities/canUseTouchScreen/index.js b/src/libs/DeviceCapabilities/canUseTouchScreen/index.ts
similarity index 51%
rename from src/libs/DeviceCapabilities/canUseTouchScreen/index.js
rename to src/libs/DeviceCapabilities/canUseTouchScreen/index.ts
index 17dcc9dffd73..9e21f5a42b5d 100644
--- a/src/libs/DeviceCapabilities/canUseTouchScreen/index.js
+++ b/src/libs/DeviceCapabilities/canUseTouchScreen/index.ts
@@ -1,29 +1,38 @@
+import {Merge} from 'type-fest';
+import CanUseTouchScreen from './types';
+
+type ExtendedNavigator = Merge<Navigator, {msMaxTouchPoints: number}>;
+
 /**
  * Allows us to identify whether the platform has a touchscreen.
  *
  * https://developer.mozilla.org/en-US/docs/Web/HTTP/Browser_detection_using_the_user_agent
- *
- * @returns {Boolean}
  */
-function canUseTouchScreen() {
+const canUseTouchScreen: CanUseTouchScreen = () => {
     let hasTouchScreen = false;
+
+    // TypeScript removed support for msMaxTouchPoints, this doesn't mean however that
+    // this property doesn't exist - hence the use of ExtendedNavigator to ensure
+    // that the functionality doesn't change
+    // https://github.com/microsoft/TypeScript-DOM-lib-generator/issues/1029
     if ('maxTouchPoints' in navigator) {
         hasTouchScreen = navigator.maxTouchPoints > 0;
     } else if ('msMaxTouchPoints' in navigator) {
-        hasTouchScreen = navigator.msMaxTouchPoints > 0;
+        hasTouchScreen = (navigator as ExtendedNavigator).msMaxTouchPoints > 0;
     } else {
-        const mQ = window.matchMedia && matchMedia('(pointer:coarse)');
+        // Same case as for Navigator - TypeScript thinks that matchMedia is obligatory property of window although it may not be
+        const mQ = window.matchMedia?.('(pointer:coarse)');
         if (mQ && mQ.media === '(pointer:coarse)') {
             hasTouchScreen = !!mQ.matches;
         } else if ('orientation' in window) {
             hasTouchScreen = true; // deprecated, but good fallback
         } else {
             // Only as a last resort, fall back to user agent sniffing
-            const UA = navigator.userAgent;
+            const UA = (navigator as ExtendedNavigator).userAgent;
             hasTouchScreen = /\b(BlackBerry|webOS|iPhone|IEMobile)\b/i.test(UA) || /\b(Android|Windows Phone|iPad|iPod)\b/i.test(UA);
         }
     }
     return hasTouchScreen;
-}
+};
 
 export default canUseTouchScreen;
diff --git a/src/libs/DeviceCapabilities/canUseTouchScreen/types.ts b/src/libs/DeviceCapabilities/canUseTouchScreen/types.ts
new file mode 100644
index 000000000000..6b71ecffeb05
--- /dev/null
+++ b/src/libs/DeviceCapabilities/canUseTouchScreen/types.ts
@@ -0,0 +1,3 @@
+type CanUseTouchScreen = () => boolean;
+
+export default CanUseTouchScreen;
diff --git a/src/libs/DeviceCapabilities/hasHoverSupport/index.js b/src/libs/DeviceCapabilities/hasHoverSupport/index.js
deleted file mode 100644
index 84a3fbbc5ed1..000000000000
--- a/src/libs/DeviceCapabilities/hasHoverSupport/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Allows us to identify whether the platform is hoverable.
- *
- * @returns {Boolean}
- */
-function hasHoverSupport() {
-    return window.matchMedia('(hover: hover) and (pointer: fine)').matches;
-}
-
-export default hasHoverSupport;
diff --git a/src/libs/DeviceCapabilities/hasHoverSupport/index.native.js b/src/libs/DeviceCapabilities/hasHoverSupport/index.native.ts
similarity index 52%
rename from src/libs/DeviceCapabilities/hasHoverSupport/index.native.js
rename to src/libs/DeviceCapabilities/hasHoverSupport/index.native.ts
index d77fcc17448a..097b3b0cbba1 100644
--- a/src/libs/DeviceCapabilities/hasHoverSupport/index.native.js
+++ b/src/libs/DeviceCapabilities/hasHoverSupport/index.native.ts
@@ -1,9 +1,8 @@
+import HasHoverSupport from './types';
+
 /**
  * Allows us to identify whether the platform is hoverable.
- *
- * @returns {Boolean}
  */
-
-const hasHoverSupport = () => false;
+const hasHoverSupport: HasHoverSupport = () => false;
 
 export default hasHoverSupport;
diff --git a/src/libs/DeviceCapabilities/hasHoverSupport/index.ts b/src/libs/DeviceCapabilities/hasHoverSupport/index.ts
new file mode 100644
index 000000000000..1ff0f461db69
--- /dev/null
+++ b/src/libs/DeviceCapabilities/hasHoverSupport/index.ts
@@ -0,0 +1,8 @@
+import HasHoverSupport from './types';
+
+/**
+ * Allows us to identify whether the platform is hoverable.
+ */
+const hasHoverSupport: HasHoverSupport = () => window.matchMedia?.('(hover: hover) and (pointer: fine)').matches;
+
+export default hasHoverSupport;
diff --git a/src/libs/DeviceCapabilities/hasHoverSupport/types.ts b/src/libs/DeviceCapabilities/hasHoverSupport/types.ts
new file mode 100644
index 000000000000..b8fe944cf88e
--- /dev/null
+++ b/src/libs/DeviceCapabilities/hasHoverSupport/types.ts
@@ -0,0 +1,3 @@
+type HasHoverSupport = () => boolean;
+
+export default HasHoverSupport;
diff --git a/src/libs/DeviceCapabilities/index.js b/src/libs/DeviceCapabilities/index.ts
similarity index 100%
rename from src/libs/DeviceCapabilities/index.js
rename to src/libs/DeviceCapabilities/index.ts
diff --git a/src/libs/DistanceRequestUtils.js b/src/libs/DistanceRequestUtils.js
index 25f26cc92b52..7744ee3d8bb1 100644
--- a/src/libs/DistanceRequestUtils.js
+++ b/src/libs/DistanceRequestUtils.js
@@ -1,6 +1,7 @@
 import _ from 'underscore';
 import CONST from '../CONST';
 import * as CurrencyUtils from './CurrencyUtils';
+import * as PolicyUtils from './PolicyUtils';
 
 /**
  * Retrieves the default mileage rate based on a given policy.
@@ -64,21 +65,35 @@ function convertDistanceUnit(distanceInMeters, unit) {
  *
  * @param {Number} distanceInMeters Distance traveled
  * @param {'mi' | 'km'} unit Unit that should be used to display the distance
+ * @returns {String} The distance in requested units, rounded to 2 decimals
+ */
+const getRoundedDistanceInUnits = (distanceInMeters, unit) => {
+    const convertedDistance = convertDistanceUnit(distanceInMeters, unit);
+    return convertedDistance.toFixed(2);
+};
+
+/**
+ *
+ * @param {boolean} hasRoute Whether the route exists for the distance request
+ * @param {Number} distanceInMeters Distance traveled
+ * @param {'mi' | 'km'} unit Unit that should be used to display the distance
  * @param {Number} rate Expensable amount allowed per unit
  * @param {String} currency The currency associated with the rate
  * @param {Function} translate Translate function
- * @returns {String} A string that describes the distance travled and the rate used for expense calculation
+ * @param {Function} toLocaleDigit Function to convert to localized digit
+ * @returns {String} A string that describes the distance traveled and the rate used for expense calculation
  */
-const getDistanceMerchant = (distanceInMeters, unit, rate, currency, translate) => {
-    const convertedDistance = convertDistanceUnit(distanceInMeters, unit);
+const getDistanceMerchant = (hasRoute, distanceInMeters, unit, rate, currency, translate, toLocaleDigit) => {
+    const distanceInUnits = hasRoute ? getRoundedDistanceInUnits(distanceInMeters, unit) : translate('common.tbd');
+
     const distanceUnit = unit === CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES ? translate('common.miles') : translate('common.kilometers');
     const singularDistanceUnit = unit === CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES ? translate('common.mile') : translate('common.kilometer');
-    const roundedDistance = convertedDistance.toFixed(2);
-    const unitString = roundedDistance === 1 ? singularDistanceUnit : distanceUnit;
-    const ratePerUnit = rate * 0.01;
+    const unitString = distanceInUnits === 1 ? singularDistanceUnit : distanceUnit;
+
+    const ratePerUnit = PolicyUtils.getUnitRateValue({rate}, toLocaleDigit);
     const currencySymbol = CurrencyUtils.getCurrencySymbol(currency) || `${currency} `;
 
-    return `${roundedDistance} ${unitString} @ ${currencySymbol}${ratePerUnit} / ${singularDistanceUnit}`;
+    return `${distanceInUnits} ${unitString} @ ${currencySymbol}${ratePerUnit} / ${singularDistanceUnit}`;
 };
 
 /**
@@ -91,7 +106,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/DomUtils/index.js b/src/libs/DomUtils/index.js
deleted file mode 100644
index ad636c6167fb..000000000000
--- a/src/libs/DomUtils/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-function blurActiveElement() {
-    document.activeElement.blur();
-}
-
-function getActiveElement() {
-    return document.activeElement;
-}
-
-export default {
-    blurActiveElement,
-    getActiveElement,
-};
diff --git a/src/libs/DomUtils/index.native.js b/src/libs/DomUtils/index.native.js
deleted file mode 100644
index 1d3ef14c954d..000000000000
--- a/src/libs/DomUtils/index.native.js
+++ /dev/null
@@ -1,10 +0,0 @@
-function blurActiveElement() {}
-
-function getActiveElement() {
-    return undefined;
-}
-
-export default {
-    blurActiveElement,
-    getActiveElement,
-};
diff --git a/src/libs/DomUtils/index.native.ts b/src/libs/DomUtils/index.native.ts
new file mode 100644
index 000000000000..d3774baec208
--- /dev/null
+++ b/src/libs/DomUtils/index.native.ts
@@ -0,0 +1,10 @@
+import {BlurActiveElement, GetActiveElement} from './types';
+
+const blurActiveElement: BlurActiveElement = () => {};
+
+const getActiveElement: GetActiveElement = () => null;
+
+export default {
+    blurActiveElement,
+    getActiveElement,
+};
diff --git a/src/libs/DomUtils/index.ts b/src/libs/DomUtils/index.ts
new file mode 100644
index 000000000000..784a01bd7885
--- /dev/null
+++ b/src/libs/DomUtils/index.ts
@@ -0,0 +1,18 @@
+import {BlurActiveElement, GetActiveElement} from './types';
+
+const blurActiveElement: BlurActiveElement = () => {
+    const activeElement = document.activeElement as HTMLElement;
+
+    if (!activeElement?.blur) {
+        return;
+    }
+
+    activeElement.blur();
+};
+
+const getActiveElement: GetActiveElement = () => document.activeElement;
+
+export default {
+    blurActiveElement,
+    getActiveElement,
+};
diff --git a/src/libs/DomUtils/types.ts b/src/libs/DomUtils/types.ts
new file mode 100644
index 000000000000..8be7b3cddae5
--- /dev/null
+++ b/src/libs/DomUtils/types.ts
@@ -0,0 +1,4 @@
+type BlurActiveElement = () => void;
+type GetActiveElement = () => Element | null;
+
+export type {BlurActiveElement, GetActiveElement};
diff --git a/src/libs/E2E/API.mock.js b/src/libs/E2E/API.mock.js
index 501108025979..47f445f72222 100644
--- a/src/libs/E2E/API.mock.js
+++ b/src/libs/E2E/API.mock.js
@@ -19,6 +19,7 @@ const mocks = {
     BeginSignIn: mockBeginSignin,
     SigninUser: mockSigninUser,
     OpenApp: mockOpenApp,
+    ReconnectApp: mockOpenApp,
     OpenReport: mockOpenReport,
     AuthenticatePusher: mockAuthenticatePusher,
 };
diff --git a/src/libs/E2E/apiMocks/openApp.js b/src/libs/E2E/apiMocks/openApp.js
index 745c1952f07d..d50f4462cfd9 100644
--- a/src/libs/E2E/apiMocks/openApp.js
+++ b/src/libs/E2E/apiMocks/openApp.js
@@ -1094,7 +1094,6 @@ export default () => ({
                     },
                     firstName: '',
                     lastName: '',
-                    payPalMeAddress: 'qwerty',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1110,7 +1109,6 @@ export default () => ({
                     },
                     firstName: '"Chat N',
                     lastName: 'Laz"',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1126,7 +1124,6 @@ export default () => ({
                     },
                     firstName: '',
                     lastName: '',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1142,7 +1139,6 @@ export default () => ({
                     },
                     firstName: '123',
                     lastName: 'Ios',
-                    payPalMeAddress: 'Wwerty',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1158,7 +1154,6 @@ export default () => ({
                     },
                     firstName: 'Qqq',
                     lastName: 'Qqq',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1174,7 +1169,6 @@ export default () => ({
                     },
                     firstName: 'Main',
                     lastName: 'Ios🏴󠁧󠁢󠁳󠁣󠁴󠁿ios',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1190,7 +1184,6 @@ export default () => ({
                     },
                     firstName: '0604',
                     lastName: 'Lsn',
-                    payPalMeAddress: '12345',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1206,7 +1199,6 @@ export default () => ({
                     },
                     firstName: '07 04 0704',
                     lastName: 'Lsn lsn',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1222,7 +1214,6 @@ export default () => ({
                     },
                     firstName: 'Katya',
                     lastName: 'Becciv',
-                    payPalMeAddress: 'testing',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1238,7 +1229,6 @@ export default () => ({
                     },
                     firstName: 'Katie',
                     lastName: 'Becciv',
-                    payPalMeAddress: 'kbecciv',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1254,7 +1244,6 @@ export default () => ({
                     },
                     firstName: '11',
                     lastName: '11',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1270,7 +1259,6 @@ export default () => ({
                     },
                     firstName: '"First"',
                     lastName: '',
-                    payPalMeAddress: '444555',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1286,7 +1274,6 @@ export default () => ({
                     },
                     firstName: 'bernardo',
                     lastName: 'utest',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: false,
                 },
@@ -1302,7 +1289,6 @@ export default () => ({
                     },
                     firstName: 'Chat',
                     lastName: 'HT',
-                    payPalMeAddress: '111',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1318,7 +1304,6 @@ export default () => ({
                     },
                     firstName: '',
                     lastName: '',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1334,7 +1319,6 @@ export default () => ({
                     },
                     firstName: '',
                     lastName: '',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1350,7 +1334,6 @@ export default () => ({
                     },
                     firstName: '',
                     lastName: '',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                     localCurrencyCode: 'USD',
@@ -1367,7 +1350,6 @@ export default () => ({
                     },
                     firstName: '',
                     lastName: '',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1383,7 +1365,6 @@ export default () => ({
                     },
                     firstName: '',
                     lastName: '',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1399,7 +1380,6 @@ export default () => ({
                     },
                     firstName: 'Applause',
                     lastName: 'Main Account',
-                    payPalMeAddress: 'ss',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1415,7 +1395,6 @@ export default () => ({
                     },
                     firstName: 'Christoph',
                     lastName: 'Pader',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1431,7 +1410,6 @@ export default () => ({
                     },
                     firstName: 'Concierge',
                     lastName: '',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1447,7 +1425,6 @@ export default () => ({
                     },
                     firstName: 'Chat S',
                     lastName: '',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -1463,7 +1440,6 @@ export default () => ({
                     },
                     firstName: 'Tayla',
                     lastName: 'Simmons',
-                    payPalMeAddress: '',
                     phoneNumber: '',
                     validated: true,
                 },
@@ -2162,7 +2138,6 @@ export default () => ({
                     cachedTotal: '($1,473.11)',
                     total: 147311,
                     stateNum: 1,
-                    submitterPayPalMeAddress: '',
                     hasOutstandingIOU: true,
                 },
                 report_4249286573496381: {
@@ -2175,7 +2150,6 @@ export default () => ({
                     cachedTotal: '($212.78)',
                     total: 21278,
                     stateNum: 1,
-                    submitterPayPalMeAddress: '',
                     hasOutstandingIOU: true,
                 },
             },
diff --git a/src/libs/E2E/reactNativeLaunchingTest.js b/src/libs/E2E/reactNativeLaunchingTest.js
index 869f5d1f1f1a..13183c1044db 100644
--- a/src/libs/E2E/reactNativeLaunchingTest.js
+++ b/src/libs/E2E/reactNativeLaunchingTest.js
@@ -6,11 +6,7 @@
  */
 
 import Performance from '../Performance';
-
-// start the usual app
-Performance.markStart('regularAppStart');
-import '../../../index';
-Performance.markEnd('regularAppStart');
+import * as Metrics from '../Metrics';
 
 import E2EConfig from '../../../tests/e2e/config';
 import E2EClient from './client';
@@ -19,6 +15,11 @@ console.debug('==========================');
 console.debug('==== Running e2e test ====');
 console.debug('==========================');
 
+// Check if the performance module is available
+if (!Metrics.canCapturePerformanceMetrics()) {
+    throw new Error('Performance module not available! Please set CAPTURE_METRICS=true in your environment file!');
+}
+
 // import your test here, define its name and config first in e2e/config.js
 const tests = {
     [E2EConfig.TEST_NAMES.AppStartTime]: require('./tests/appStartTimeTest.e2e').default,
@@ -36,20 +37,33 @@ const appReady = new Promise((resolve) => {
     });
 });
 
-E2EClient.getTestConfig().then((config) => {
-    const test = tests[config.name];
-    if (!test) {
-        // instead of throwing, report the error to the server, which is better for DX
-        return E2EClient.submitTestResults({
-            name: config.name,
-            error: `Test '${config.name}' not found`,
-        });
-    }
-    console.debug(`[E2E] Configured for test ${config.name}. Waiting for app to become ready`);
-
-    appReady.then(() => {
-        console.debug('[E2E] App is ready, running test…');
-        Performance.measureFailSafe('appStartedToReady', 'regularAppStart');
-        test();
+E2EClient.getTestConfig()
+    .then((config) => {
+        const test = tests[config.name];
+        if (!test) {
+            // instead of throwing, report the error to the server, which is better for DX
+            return E2EClient.submitTestResults({
+                name: config.name,
+                error: `Test '${config.name}' not found`,
+            });
+        }
+
+        console.debug(`[E2E] Configured for test ${config.name}. Waiting for app to become ready`);
+        appReady
+            .then(() => {
+                console.debug('[E2E] App is ready, running test…');
+                Performance.measureFailSafe('appStartedToReady', 'regularAppStart');
+                test();
+            })
+            .catch((error) => {
+                console.error('[E2E] Error while waiting for app to become ready', error);
+            });
+    })
+    .catch((error) => {
+        console.error("[E2E] Error while running test. Couldn't get test config!", error);
     });
-});
+
+// start the usual app
+Performance.markStart('regularAppStart');
+import '../../../index';
+Performance.markEnd('regularAppStart');
diff --git a/src/libs/E2E/tests/openSearchPageTest.e2e.js b/src/libs/E2E/tests/openSearchPageTest.e2e.js
index 2f0f72f35bdd..3b2d91322cf0 100644
--- a/src/libs/E2E/tests/openSearchPageTest.e2e.js
+++ b/src/libs/E2E/tests/openSearchPageTest.e2e.js
@@ -7,24 +7,41 @@ import CONST from '../../../CONST';
 
 const test = () => {
     // check for login (if already logged in the action will simply resolve)
+    console.debug('[E2E] Logging in for search');
+
     E2ELogin().then((neededLogin) => {
         if (neededLogin) {
             // we don't want to submit the first login to the results
             return E2EClient.submitTestDone();
         }
 
+        console.debug('[E2E] Logged in, getting search metrics and submitting them…');
+
         Performance.subscribeToMeasurements((entry) => {
+            if (entry.name === CONST.TIMING.SIDEBAR_LOADED) {
+                console.debug(`[E2E] Sidebar loaded, navigating to search route…`);
+                Navigation.navigate(ROUTES.SEARCH);
+                return;
+            }
+
+            console.debug(`[E2E] Entry: ${JSON.stringify(entry)}`);
             if (entry.name !== CONST.TIMING.SEARCH_RENDER) {
                 return;
             }
 
+            console.debug(`[E2E] Submitting!`);
             E2EClient.submitTestResults({
                 name: 'Open Search Page TTI',
                 duration: entry.duration,
-            }).then(E2EClient.submitTestDone);
+            })
+                .then(() => {
+                    console.debug('[E2E] Done with search, exiting…');
+                    E2EClient.submitTestDone();
+                })
+                .catch((err) => {
+                    console.debug('[E2E] Error while submitting test results:', err);
+                });
         });
-
-        Navigation.navigate(ROUTES.SEARCH);
     });
 };
 
diff --git a/src/libs/EmojiTrie.js b/src/libs/EmojiTrie.js
deleted file mode 100644
index b0bd0d5eec5d..000000000000
--- a/src/libs/EmojiTrie.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import _ from 'underscore';
-import emojis, {localeEmojis} from '../../assets/emojis';
-import Trie from './Trie';
-import Timing from './actions/Timing';
-import CONST from '../CONST';
-
-Timing.start(CONST.TIMING.TRIE_INITIALIZATION);
-
-const supportedLanguages = [CONST.LOCALES.DEFAULT, CONST.LOCALES.ES];
-
-function createTrie(lang = CONST.LOCALES.DEFAULT) {
-    const trie = new Trie();
-    const langEmojis = localeEmojis[lang];
-    const isDefaultLocale = lang === CONST.LOCALES.DEFAULT;
-
-    _.forEach(emojis, (item) => {
-        if (item.header) {
-            return;
-        }
-
-        const englishName = item.name;
-        const localeName = _.get(langEmojis, [item.code, 'name'], englishName);
-
-        const node = trie.search(localeName);
-        if (!node) {
-            trie.add(localeName, {code: item.code, types: item.types, name: localeName, suggestions: []});
-        } else {
-            trie.update(localeName, {code: item.code, types: item.types, name: localeName, suggestions: node.metaData.suggestions});
-        }
-
-        // Add keywords for both the locale language and English to enable users to search using either language.
-        const keywords = _.get(langEmojis, [item.code, 'keywords'], []).concat(isDefaultLocale ? [] : _.get(localeEmojis, [CONST.LOCALES.DEFAULT, item.code, 'keywords'], []));
-        for (let j = 0; j < keywords.length; j++) {
-            const keywordNode = trie.search(keywords[j]);
-            if (!keywordNode) {
-                trie.add(keywords[j], {suggestions: [{code: item.code, types: item.types, name: localeName}]});
-            } else {
-                trie.update(keywords[j], {
-                    ...keywordNode.metaData,
-                    suggestions: [...keywordNode.metaData.suggestions, {code: item.code, types: item.types, name: localeName}],
-                });
-            }
-        }
-
-        // If current language isn't the default, prepend the English name of the emoji in the suggestions as well.
-        // We do this because when the user types the english name of the emoji, we want to show the emoji in the suggestions before all the others.
-        if (!isDefaultLocale) {
-            const englishNode = trie.search(englishName);
-            if (!englishNode) {
-                trie.add(englishName, {suggestions: [{code: item.code, types: item.types, name: localeName}]});
-            } else {
-                trie.update(englishName, {
-                    ...englishNode.metaData,
-                    suggestions: [{code: item.code, types: item.types, name: localeName}, ...englishNode.metaData.suggestions],
-                });
-            }
-        }
-    });
-
-    return trie;
-}
-
-const emojiTrie = _.reduce(supportedLanguages, (prev, cur) => ({...prev, [cur]: createTrie(cur)}), {});
-
-Timing.end(CONST.TIMING.TRIE_INITIALIZATION);
-
-export default emojiTrie;
diff --git a/src/libs/EmojiTrie.ts b/src/libs/EmojiTrie.ts
new file mode 100644
index 000000000000..d0a53acf29c9
--- /dev/null
+++ b/src/libs/EmojiTrie.ts
@@ -0,0 +1,123 @@
+import React from 'react';
+import {SvgProps} from 'react-native-svg';
+import emojis, {localeEmojis} from '../../assets/emojis';
+import Trie from './Trie';
+import Timing from './actions/Timing';
+import CONST from '../CONST';
+
+type Emoji = {
+    code: string;
+    header?: boolean;
+    icon?: React.FC<SvgProps>;
+    name?: string;
+    types?: string[];
+};
+
+type LocalizedEmoji = {
+    name?: string;
+    keywords: string[];
+};
+
+type LocalizedEmojis = Record<string, LocalizedEmoji>;
+
+type Suggestion = {
+    code: string;
+    types?: string[];
+    name?: string;
+};
+
+type EmojiMetaData = {
+    suggestions?: Suggestion[];
+};
+
+Timing.start(CONST.TIMING.TRIE_INITIALIZATION);
+
+const supportedLanguages = [CONST.LOCALES.DEFAULT, CONST.LOCALES.ES] as const;
+
+type SupportedLanguage = (typeof supportedLanguages)[number];
+
+type EmojiTrie = {
+    [key in SupportedLanguage]?: Trie<EmojiMetaData>;
+};
+
+/**
+ *
+ * @param trie The Trie object.
+ * @param keywords An array containing the keywords.
+ * @param item An object containing the properties of the emoji.
+ * @param name The localized name of the emoji.
+ * @param shouldPrependKeyword Prepend the keyword (instead of append) to the suggestions
+ */
+function addKeywordsToTrie(trie: Trie<EmojiMetaData>, keywords: string[], item: Emoji, name: string, shouldPrependKeyword = false) {
+    keywords.forEach((keyword) => {
+        const keywordNode = trie.search(keyword);
+        if (!keywordNode) {
+            trie.add(keyword, {suggestions: [{code: item.code, types: item.types, name}]});
+        } else {
+            const suggestion = {code: item.code, types: item.types, name};
+            const suggestions = shouldPrependKeyword ? [suggestion, ...(keywordNode.metaData.suggestions ?? [])] : [...(keywordNode.metaData.suggestions ?? []), suggestion];
+            trie.update(keyword, {
+                ...keywordNode.metaData,
+                suggestions,
+            });
+        }
+    });
+}
+
+/**
+ * Allows searching based on parts of the name. This turns 'white_large_square' into ['white_large_square', 'large_square', 'square'].
+ *
+ * @param name The emoji name
+ * @returns An array containing the name parts
+ */
+function getNameParts(name: string): string[] {
+    const nameSplit = name.split('_');
+    return nameSplit.map((namePart, index) => nameSplit.slice(index).join('_'));
+}
+
+function createTrie(lang: SupportedLanguage = CONST.LOCALES.DEFAULT): Trie<EmojiMetaData> {
+    const trie = new Trie();
+    const langEmojis: LocalizedEmojis = localeEmojis[lang];
+    const defaultLangEmojis: LocalizedEmojis = localeEmojis[CONST.LOCALES.DEFAULT];
+    const isDefaultLocale = lang === CONST.LOCALES.DEFAULT;
+
+    emojis.forEach((item: Emoji) => {
+        if (!item.name) {
+            return;
+        }
+
+        const englishName = item.name;
+        const localeName = langEmojis?.[item.code]?.name ?? englishName;
+
+        const node = trie.search(localeName);
+        if (!node) {
+            trie.add(localeName, {code: item.code, types: item.types, name: localeName, suggestions: []});
+        } else {
+            trie.update(localeName, {code: item.code, types: item.types, name: localeName, suggestions: node.metaData.suggestions});
+        }
+
+        const nameParts = getNameParts(localeName).slice(1); // We remove the first part because we already index the full name.
+        addKeywordsToTrie(trie, nameParts, item, localeName);
+
+        // Add keywords for both the locale language and English to enable users to search using either language.
+        const keywords = (langEmojis?.[item.code]?.keywords ?? []).concat(isDefaultLocale ? [] : defaultLangEmojis?.[item.code]?.keywords ?? []);
+        addKeywordsToTrie(trie, keywords, item, localeName);
+
+        /**
+         * If current language isn't the default, prepend the English name of the emoji in the suggestions as well.
+         * We do this because when the user types the english name of the emoji, we want to show the emoji in the suggestions before all the others.
+         */
+        if (!isDefaultLocale) {
+            const englishNameParts = getNameParts(englishName);
+            addKeywordsToTrie(trie, englishNameParts, item, localeName, true);
+        }
+    });
+
+    return trie;
+}
+
+const emojiTrie: EmojiTrie = supportedLanguages.reduce((prev, cur) => ({...prev, [cur]: createTrie(cur)}), {});
+
+Timing.end(CONST.TIMING.TRIE_INITIALIZATION);
+
+export default emojiTrie;
diff --git a/src/libs/ErrorUtils.js b/src/libs/ErrorUtils.js
deleted file mode 100644
index 95bbad5f5409..000000000000
--- a/src/libs/ErrorUtils.js
+++ /dev/null
@@ -1,135 +0,0 @@
-import _ from 'underscore';
-import lodashGet from 'lodash/get';
-import CONST from '../CONST';
-import DateUtils from './DateUtils';
-import * as Localize from './Localize';
-
-/**
- * @param {Object} response
- * @param {Number} response.jsonCode
- * @param {String} response.message
- * @returns {String}
- */
-function getAuthenticateErrorMessage(response) {
-    switch (response.jsonCode) {
-        case CONST.JSON_CODE.UNABLE_TO_RETRY:
-            return 'session.offlineMessageRetry';
-        case 401:
-            return 'passwordForm.error.incorrectLoginOrPassword';
-        case 402:
-            // If too few characters are passed as the password, the WAF will pass it to the API as an empty
-            // string, which results in a 402 error from Auth.
-            if (response.message === '402 Missing partnerUserSecret') {
-                return 'passwordForm.error.incorrectLoginOrPassword';
-            }
-            return 'passwordForm.error.twoFactorAuthenticationEnabled';
-        case 403:
-            if (response.message === 'Invalid code') {
-                return 'passwordForm.error.incorrect2fa';
-            }
-            return 'passwordForm.error.invalidLoginOrPassword';
-        case 404:
-            return 'passwordForm.error.unableToResetPassword';
-        case 405:
-            return 'passwordForm.error.noAccess';
-        case 413:
-            return 'passwordForm.error.accountLocked';
-        default:
-            return 'passwordForm.error.fallback';
-    }
-}
-
-/**
- * Method used to get an error object with microsecond as the key.
- * @param {String} error - error key or message to be saved
- * @return {Object}
- *
- */
-function getMicroSecondOnyxError(error) {
-    return {[DateUtils.getMicroseconds()]: error};
-}
-
-/**
- * @param {Object} onyxData
- * @param {Object} onyxData.errors
- * @returns {String}
- */
-function getLatestErrorMessage(onyxData) {
-    if (_.isEmpty(onyxData.errors)) {
-        return '';
-    }
-    return _.chain(onyxData.errors || [])
-        .keys()
-        .sortBy()
-        .reverse()
-        .map((key) => onyxData.errors[key])
-        .first()
-        .value();
-}
-
-/**
- * @param {Object} onyxData
- * @param {Object} onyxData.errorFields
- * @param {String} fieldName
- * @returns {Object}
- */
-function getLatestErrorField(onyxData, fieldName) {
-    const errorsForField = lodashGet(onyxData, ['errorFields', fieldName], {});
-
-    if (_.isEmpty(errorsForField)) {
-        return {};
-    }
-    return _.chain(errorsForField)
-        .keys()
-        .sortBy()
-        .reverse()
-        .map((key) => ({[key]: errorsForField[key]}))
-        .first()
-        .value();
-}
-
-/**
- * @param {Object} onyxData
- * @param {Object} onyxData.errorFields
- * @param {String} fieldName
- * @returns {Object}
- */
-function getEarliestErrorField(onyxData, fieldName) {
-    const errorsForField = lodashGet(onyxData, ['errorFields', fieldName], {});
-
-    if (_.isEmpty(errorsForField)) {
-        return {};
-    }
-    return _.chain(errorsForField)
-        .keys()
-        .sortBy()
-        .map((key) => ({[key]: errorsForField[key]}))
-        .first()
-        .value();
-}
-
-/**
- * Method used to generate error message for given inputID
- * @param {Object} errors - An object containing current errors in the form
- * @param {String} inputID
- * @param {String|Array} message - Message to assign to the inputID errors
- *
- */
-function addErrorMessage(errors, inputID, message) {
-    if (!message || !inputID) {
-        return;
-    }
-
-    const errorList = errors;
-    const translatedMessage = Localize.translateIfPhraseKey(message);
-
-    if (_.isEmpty(errorList[inputID])) {
-        errorList[inputID] = [translatedMessage, {isTranslated: true}];
-    } else if (_.isString(errorList[inputID])) {
-        errorList[inputID] = [`${errorList[inputID]}\n${translatedMessage}`, {isTranslated: true}];
-    } else {
-        errorList[inputID][0] = `${errorList[inputID][0]}\n${translatedMessage}`;
-    }
-}
-
-export {getAuthenticateErrorMessage, getMicroSecondOnyxError, getLatestErrorMessage, getLatestErrorField, getEarliestErrorField, addErrorMessage};
diff --git a/src/libs/ErrorUtils.ts b/src/libs/ErrorUtils.ts
new file mode 100644
index 000000000000..bf4fc0d810a4
--- /dev/null
+++ b/src/libs/ErrorUtils.ts
@@ -0,0 +1,114 @@
+import CONST from '../CONST';
+import DateUtils from './DateUtils';
+import * as Localize from './Localize';
+import Response from '../types/onyx/Response';
+import {ErrorFields, Errors} from '../types/onyx/OnyxCommon';
+import {TranslationFlatObject} from '../languages/types';
+
+function getAuthenticateErrorMessage(response: Response): keyof TranslationFlatObject {
+    switch (response.jsonCode) {
+        case CONST.JSON_CODE.UNABLE_TO_RETRY:
+            return 'session.offlineMessageRetry';
+        case 401:
+            return 'passwordForm.error.incorrectLoginOrPassword';
+        case 402:
+            // If too few characters are passed as the password, the WAF will pass it to the API as an empty
+            // string, which results in a 402 error from Auth.
+            if (response.message === '402 Missing partnerUserSecret') {
+                return 'passwordForm.error.incorrectLoginOrPassword';
+            }
+            return 'passwordForm.error.twoFactorAuthenticationEnabled';
+        case 403:
+            if (response.message === 'Invalid code') {
+                return 'passwordForm.error.incorrect2fa';
+            }
+            return 'passwordForm.error.invalidLoginOrPassword';
+        case 404:
+            return 'passwordForm.error.unableToResetPassword';
+        case 405:
+            return 'passwordForm.error.noAccess';
+        case 413:
+            return 'passwordForm.error.accountLocked';
+        default:
+            return 'passwordForm.error.fallback';
+    }
+}
+
+/**
+ * Method used to get an error object with microsecond as the key.
+ * @param error - error key or message to be saved
+ */
+function getMicroSecondOnyxError(error: string): Record<number, string> {
+    return {[DateUtils.getMicroseconds()]: error};
+}
+
+type OnyxDataWithErrors = {
+    errors?: Errors;
+};
+
+function getLatestErrorMessage<TOnyxData extends OnyxDataWithErrors>(onyxData: TOnyxData): string {
+    const errors = onyxData.errors ?? {};
+
+    if (Object.keys(errors).length === 0) {
+        return '';
+    }
+
+    const key = Object.keys(errors).sort().reverse()[0];
+
+    return errors[key];
+}
+
+type OnyxDataWithErrorFields = {
+    errorFields?: ErrorFields;
+};
+
+function getLatestErrorField<TOnyxData extends OnyxDataWithErrorFields>(onyxData: TOnyxData, fieldName: string): Record<string, string> {
+    const errorsForField = onyxData.errorFields?.[fieldName] ?? {};
+
+    if (Object.keys(errorsForField).length === 0) {
+        return {};
+    }
+
+    const key = Object.keys(errorsForField).sort().reverse()[0];
+
+    return {[key]: errorsForField[key]};
+}
+
+function getEarliestErrorField<TOnyxData extends OnyxDataWithErrorFields>(onyxData: TOnyxData, fieldName: string): Record<string, string> {
+    const errorsForField = onyxData.errorFields?.[fieldName] ?? {};
+
+    if (Object.keys(errorsForField).length === 0) {
+        return {};
+    }
+
+    const key = Object.keys(errorsForField).sort()[0];
+
+    return {[key]: errorsForField[key]};
+}
+
+type ErrorsList = Record<string, string | [string, {isTranslated: boolean}]>;
+
+/**
+ * Method used to generate error message for given inputID
+ * @param errorList - An object containing current errors in the form
+ * @param message - Message to assign to the inputID errors
+ */
+function addErrorMessage(errors: ErrorsList, inputID?: string, message?: string) {
+    if (!message || !inputID) {
+        return;
+    }
+
+    const errorList = errors;
+    const error = errorList[inputID];
+    const translatedMessage = Localize.translateIfPhraseKey(message);
+
+    if (!error) {
+        errorList[inputID] = [translatedMessage, {isTranslated: true}];
+    } else if (typeof error === 'string') {
+        errorList[inputID] = [`${error}\n${translatedMessage}`, {isTranslated: true}];
+    } else if (Array.isArray(error)) {
+        error[0] = `${error[0]}\n${translatedMessage}`;
+    }
+}
+
+export {getAuthenticateErrorMessage, getMicroSecondOnyxError, getLatestErrorMessage, getLatestErrorField, getEarliestErrorField, addErrorMessage};
diff --git a/src/libs/Firebase/index.js b/src/libs/Firebase/index.js
deleted file mode 100644
index a8c7a34f869f..000000000000
--- a/src/libs/Firebase/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Web does not use Firebase for performance tracing */
-
-export default {
-    startTrace() {},
-    stopTrace() {},
-};
diff --git a/src/libs/Firebase/index.native.js b/src/libs/Firebase/index.native.ts
similarity index 71%
rename from src/libs/Firebase/index.native.js
rename to src/libs/Firebase/index.native.ts
index 0fc452a523ec..2014e2b8bd3e 100644
--- a/src/libs/Firebase/index.native.js
+++ b/src/libs/Firebase/index.native.ts
@@ -1,15 +1,11 @@
 /* eslint-disable no-unused-vars */
 import perf from '@react-native-firebase/perf';
-import lodashGet from 'lodash/get';
 import * as Environment from '../Environment/Environment';
-import Log from '../Log';
+import {StartTrace, StopTrace, TraceMap} from './types';
 
-const traceMap = {};
+const traceMap: TraceMap = {};
 
-/**
- * @param {String} customEventName
- */
-function startTrace(customEventName) {
+const startTrace: StartTrace = (customEventName) => {
     const start = global.performance.now();
     if (Environment.isDevelopment()) {
         return;
@@ -27,18 +23,16 @@ function startTrace(customEventName) {
                 start,
             };
         });
-}
+};
 
-/**
- * @param {String} customEventName
- */
-function stopTrace(customEventName) {
-    const stop = global.performance.now();
+const stopTrace: StopTrace = (customEventName) => {
+    // Uncomment to inspect logs on release builds
+    // const stop = global.performance.now();
     if (Environment.isDevelopment()) {
         return;
     }
 
-    const trace = lodashGet(traceMap, [customEventName, 'trace']);
+    const trace = traceMap[customEventName].trace;
     if (!trace) {
         return;
     }
@@ -50,7 +44,7 @@ function stopTrace(customEventName) {
     // Log.info(`sidebar_loaded: ${stop - start} ms`, true);
 
     delete traceMap[customEventName];
-}
+};
 
 export default {
     startTrace,
diff --git a/src/libs/Firebase/index.ts b/src/libs/Firebase/index.ts
new file mode 100644
index 000000000000..3048cf1d9bd8
--- /dev/null
+++ b/src/libs/Firebase/index.ts
@@ -0,0 +1,10 @@
+import {StartTrace, StopTrace} from './types';
+
+/** Web does not use Firebase for performance tracing */
+const startTrace: StartTrace = () => {};
+const stopTrace: StopTrace = () => {};
+
+export default {
+    startTrace,
+    stopTrace,
+};
diff --git a/src/libs/Firebase/types.ts b/src/libs/Firebase/types.ts
new file mode 100644
index 000000000000..3822f7072a7f
--- /dev/null
+++ b/src/libs/Firebase/types.ts
@@ -0,0 +1,11 @@
+import {FirebasePerformanceTypes} from '@react-native-firebase/perf';
+
+type Trace = {
+    trace: FirebasePerformanceTypes.Trace;
+    start: number;
+};
+type TraceMap = Record<string, Trace>;
+type StartTrace = (customEventName: string) => void;
+type StopTrace = (customEventName: string) => void;
+
+export type {StartTrace, StopTrace, TraceMap};
diff --git a/src/libs/FormHelper.js b/src/libs/FormHelper.js
deleted file mode 100644
index feab0f44acea..000000000000
--- a/src/libs/FormHelper.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import _ from 'underscore';
-import lodashGet from 'lodash/get';
-import lodashUnset from 'lodash/unset';
-import lodashCloneDeep from 'lodash/cloneDeep';
-
-class FormHelper {
-    constructor({errorPath, setErrors}) {
-        this.errorPath = errorPath;
-        this.setErrors = setErrors;
-        this.getErrors = this.getErrors.bind(this);
-        this.clearError = this.clearError.bind(this);
-        this.clearErrors = this.clearErrors.bind(this);
-    }
-
-    /**
-     * @param {Object} props
-     * @returns {Object}
-     */
-    getErrors(props) {
-        return lodashGet(props, this.errorPath, {});
-    }
-
-    /**
-     * @param {Object} props
-     * @param {String[]} paths
-     */
-    clearErrors(props, paths) {
-        const errors = this.getErrors(props);
-        const pathsWithErrors = _.filter(paths, (path) => lodashGet(errors, path, false));
-        if (_.size(pathsWithErrors) === 0) {
-            // No error found for this path
-            return;
-        }
-
-        // Clear the existing errors
-        const newErrors = lodashCloneDeep(errors);
-        _.forEach(pathsWithErrors, (path) => lodashUnset(newErrors, path));
-        this.setErrors(newErrors);
-    }
-
-    /**
-     * @param {Object} props
-     * @param {String} path
-     */
-    clearError(props, path) {
-        this.clearErrors(props, [path]);
-    }
-}
-
-export default FormHelper;
diff --git a/src/libs/GetStyledTextArray.js b/src/libs/GetStyledTextArray.ts
similarity index 86%
rename from src/libs/GetStyledTextArray.js
rename to src/libs/GetStyledTextArray.ts
index 576e6f98c94b..cdcedbac2a4f 100644
--- a/src/libs/GetStyledTextArray.js
+++ b/src/libs/GetStyledTextArray.ts
@@ -1,12 +1,11 @@
 import Str from 'expensify-common/lib/str';
 
-/**
- * Render a suggestion menu item component.
- * @param {String} name
- * @param {String} prefix
- * @returns {Array}
- */
-const getStyledTextArray = (name, prefix) => {
+type StyledText = {
+    text: string;
+    isColored: boolean;
+};
+
+const getStyledTextArray = (name: string, prefix: string): StyledText[] => {
     const texts = [];
     const prefixLowercase = prefix.toLowerCase();
     const prefixLocation = name.toLowerCase().search(Str.escapeForRegExp(prefixLowercase));
diff --git a/src/libs/GooglePlacesUtils.js b/src/libs/GooglePlacesUtils.js
deleted file mode 100644
index 8723598264fb..000000000000
--- a/src/libs/GooglePlacesUtils.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import _ from 'underscore';
-
-/**
- * Finds an address component by type, and returns the value associated to key. Each address component object
- * inside the addressComponents array has the following structure:
- * [{
- *   long_name: "New York",
- *   short_name: "New York",
- *   types: [ "locality", "political" ]
- * }]
- *
- * @param {Array} addressComponents
- * @param {Object} fieldsToExtract – has shape: {addressType: 'keyToUse'}
- * @returns {Object}
- */
-function getAddressComponents(addressComponents, fieldsToExtract) {
-    const result = _.mapObject(fieldsToExtract, () => '');
-    _.each(addressComponents, (addressComponent) => {
-        _.each(addressComponent.types, (addressType) => {
-            if (!_.has(fieldsToExtract, addressType) || !_.isEmpty(result[addressType])) {
-                return;
-            }
-            const value = addressComponent[fieldsToExtract[addressType]] ? addressComponent[fieldsToExtract[addressType]] : '';
-            result[addressType] = value;
-        });
-    });
-    return result;
-}
-
-/**
- * Finds an address term by type, and returns the value associated to key. Note that each term in the address must
- * conform to the following ORDER: <street, city, state, country>
- *
- * @param {Array} addressTerms
- * @returns {Object}
- */
-function getPlaceAutocompleteTerms(addressTerms) {
-    const fieldsToExtract = ['country', 'state', 'city', 'street'];
-    const result = {};
-    _.each(fieldsToExtract, (fieldToExtract, index) => {
-        const fieldTermIndex = addressTerms.length - (index + 1);
-        result[fieldToExtract] = fieldTermIndex >= 0 ? addressTerms[fieldTermIndex].value : '';
-    });
-    return result;
-}
-
-export {
-    // eslint-disable-next-line import/prefer-default-export
-    getAddressComponents,
-    getPlaceAutocompleteTerms,
-};
diff --git a/src/libs/GooglePlacesUtils.ts b/src/libs/GooglePlacesUtils.ts
new file mode 100644
index 000000000000..43fac2b9a785
--- /dev/null
+++ b/src/libs/GooglePlacesUtils.ts
@@ -0,0 +1,53 @@
+type AddressComponent = {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    long_name: string;
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    short_name: string;
+    types: string[];
+};
+type FieldsToExtract = Record<string, Exclude<keyof AddressComponent, 'types'>>;
+
+/**
+ * Finds an address component by type, and returns the value associated to key. Each address component object
+ * inside the addressComponents array has the following structure:
+ * [{
+ *   long_name: "New York",
+ *   short_name: "New York",
+ *   types: [ "locality", "political" ]
+ * }]
+ */
+function getAddressComponents(addressComponents: AddressComponent[], fieldsToExtract: FieldsToExtract): Record<string, string> {
+    const result: Record<string, string> = {};
+    Object.keys(fieldsToExtract).forEach((key) => (result[key] = ''));
+
+    addressComponents.forEach((addressComponent) => {
+        addressComponent.types.forEach((addressType) => {
+            if (!(addressType in fieldsToExtract) || !(addressType in result && result[addressType] === '')) {
+                return;
+            }
+            const value = addressComponent[fieldsToExtract[addressType]] ? addressComponent[fieldsToExtract[addressType]] : '';
+            result[addressType] = value;
+        });
+    });
+    return result;
+}
+
+type AddressTerm = {value: string};
+type GetPlaceAutocompleteTermsResultKey = 'country' | 'state' | 'city' | 'street';
+type GetPlaceAutocompleteTermsResult = Partial<Record<GetPlaceAutocompleteTermsResultKey, string>>;
+
+/**
+ * Finds an address term by type, and returns the value associated to key. Note that each term in the address must
+ * conform to the following ORDER: <street, city, state, country>
+ */
+function getPlaceAutocompleteTerms(addressTerms: AddressTerm[]): GetPlaceAutocompleteTermsResult {
+    const fieldsToExtract: GetPlaceAutocompleteTermsResultKey[] = ['country', 'state', 'city', 'street'];
+    const result: GetPlaceAutocompleteTermsResult = {};
+    fieldsToExtract.forEach((fieldToExtract, index) => {
+        const fieldTermIndex = addressTerms.length - (index + 1);
+        result[fieldToExtract] = fieldTermIndex >= 0 ? addressTerms[fieldTermIndex].value : '';
+    });
+    return result;
+}
+
+export {getAddressComponents, getPlaceAutocompleteTerms};
diff --git a/src/libs/Growl.js b/src/libs/Growl.js
deleted file mode 100644
index 81994dd4c255..000000000000
--- a/src/libs/Growl.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import React from 'react';
-import CONST from '../CONST';
-
-const growlRef = React.createRef();
-let resolveIsReadyPromise;
-const isReadyPromise = new Promise((resolve) => {
-    resolveIsReadyPromise = resolve;
-});
-
-function setIsReady() {
-    resolveIsReadyPromise();
-}
-
-/**
- * Show the growl notification
- *
- * @param {String} bodyText
- * @param {String} type
- * @param {Number} [duration]
- */
-function show(bodyText, type, duration = CONST.GROWL.DURATION) {
-    isReadyPromise.then(() => growlRef.current.show(bodyText, type, duration));
-}
-
-/**
- * Show error growl
- *
- * @param {String} bodyText
- * @param {Number} [duration]
- */
-function error(bodyText, duration = CONST.GROWL.DURATION) {
-    show(bodyText, CONST.GROWL.ERROR, duration);
-}
-
-/**
- * Show success growl
- *
- * @param {String} bodyText
- * @param {Number} [duration]
- */
-function success(bodyText, duration = CONST.GROWL.DURATION) {
-    show(bodyText, CONST.GROWL.SUCCESS, duration);
-}
-
-export default {
-    show,
-    error,
-    success,
-};
-
-export {growlRef, setIsReady};
diff --git a/src/libs/Growl.ts b/src/libs/Growl.ts
new file mode 100644
index 000000000000..33d7311973cb
--- /dev/null
+++ b/src/libs/Growl.ts
@@ -0,0 +1,53 @@
+import React from 'react';
+import CONST from '../CONST';
+
+type GrowlRef = {
+    show?: (bodyText: string, type: string, duration: number) => void;
+};
+
+const growlRef = React.createRef<GrowlRef>();
+let resolveIsReadyPromise: undefined | ((value?: unknown) => void);
+const isReadyPromise = new Promise((resolve) => {
+    resolveIsReadyPromise = resolve;
+});
+
+function setIsReady() {
+    if (!resolveIsReadyPromise) {
+        return;
+    }
+    resolveIsReadyPromise();
+}
+
+/**
+ * Show the growl notification
+ */
+function show(bodyText: string, type: string, duration: number = CONST.GROWL.DURATION) {
+    isReadyPromise.then(() => {
+        if (!growlRef?.current?.show) {
+            return;
+        }
+        growlRef.current.show(bodyText, type, duration);
+    });
+}
+
+/**
+ * Show error growl
+ */
+function error(bodyText: string, duration: number = CONST.GROWL.DURATION) {
+    show(bodyText, CONST.GROWL.ERROR, duration);
+}
+
+/**
+ * Show success growl
+ */
+function success(bodyText: string, duration: number = CONST.GROWL.DURATION) {
+    show(bodyText, CONST.GROWL.SUCCESS, duration);
+}
+
+export default {
+    show,
+    error,
+    success,
+};
+
+export {growlRef, setIsReady};
diff --git a/src/libs/HapticFeedback/index.native.js b/src/libs/HapticFeedback/index.native.js
deleted file mode 100644
index bc57c74d8d04..000000000000
--- a/src/libs/HapticFeedback/index.native.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
-
-function press() {
-    ReactNativeHapticFeedback.trigger('impactLight', {
-        enableVibrateFallback: true,
-    });
-}
-
-function longPress() {
-    ReactNativeHapticFeedback.trigger('impactHeavy', {
-        enableVibrateFallback: true,
-    });
-}
-
-function success() {
-    ReactNativeHapticFeedback.trigger('notificationSuccess', {
-        enableVibrateFallback: true,
-    });
-}
-
-function error() {
-    ReactNativeHapticFeedback.trigger('notificationError', {
-        enableVibrateFallback: true,
-    });
-}
-
-export default {
-    press,
-    longPress,
-    success,
-    error,
-};
diff --git a/src/libs/HapticFeedback/index.native.ts b/src/libs/HapticFeedback/index.native.ts
new file mode 100644
index 000000000000..4c3605cc27ef
--- /dev/null
+++ b/src/libs/HapticFeedback/index.native.ts
@@ -0,0 +1,27 @@
+import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
+import HapticFeedback from './types';
+
+const hapticFeedback: HapticFeedback = {
+    press: () => {
+        ReactNativeHapticFeedback.trigger('impactLight', {
+            enableVibrateFallback: true,
+        });
+    },
+    longPress: () => {
+        ReactNativeHapticFeedback.trigger('impactHeavy', {
+            enableVibrateFallback: true,
+        });
+    },
+    success: () => {
+        ReactNativeHapticFeedback.trigger('notificationSuccess', {
+            enableVibrateFallback: true,
+        });
+    },
+    error: () => {
+        ReactNativeHapticFeedback.trigger('notificationError', {
+            enableVibrateFallback: true,
+        });
+    },
+};
+
+export default hapticFeedback;
diff --git a/src/libs/HapticFeedback/index.js b/src/libs/HapticFeedback/index.ts
similarity index 55%
rename from src/libs/HapticFeedback/index.js
rename to src/libs/HapticFeedback/index.ts
index cef9f994ddaf..3dd5b87f573b 100644
--- a/src/libs/HapticFeedback/index.js
+++ b/src/libs/HapticFeedback/index.ts
@@ -1,9 +1,13 @@
+import HapticFeedback from './types';
+
 /**
  * Web does not support Haptic feedback
  */
-export default {
+const hapticFeedback: HapticFeedback = {
     press: () => {},
     longPress: () => {},
     success: () => {},
     error: () => {},
 };
+
+export default hapticFeedback;
diff --git a/src/libs/HapticFeedback/types.ts b/src/libs/HapticFeedback/types.ts
new file mode 100644
index 000000000000..3db056fad148
--- /dev/null
+++ b/src/libs/HapticFeedback/types.ts
@@ -0,0 +1,8 @@
+type HapticFeedback = {
+    press: () => void;
+    longPress: () => void;
+    success: () => void;
+    error: () => void;
+};
+
+export default HapticFeedback;
diff --git a/src/libs/IOUUtils.js b/src/libs/IOUUtils.ts
similarity index 51%
rename from src/libs/IOUUtils.js
rename to src/libs/IOUUtils.ts
index 2042c6beda05..6f6024506985 100644
--- a/src/libs/IOUUtils.js
+++ b/src/libs/IOUUtils.ts
@@ -1,18 +1,17 @@
-import _ from 'underscore';
 import CONST from '../CONST';
 import * as TransactionUtils from './TransactionUtils';
 import * as CurrencyUtils from './CurrencyUtils';
+import {Report, Transaction} from '../types/onyx';
 
 /**
  * Calculates the amount per user given a list of participants
  *
- * @param {Number} numberOfParticipants - Number of participants in the chat. It should not include the current user.
- * @param {Number} total - IOU total amount in backend format (cents, no matter the currency)
- * @param {String} currency - This is used to know how many decimal places are valid to use when splitting the total
- * @param {Boolean} isDefaultUser - Whether we are calculating the amount for the current user
- * @returns {Number}
+ * @param numberOfParticipants - Number of participants in the chat. It should not include the current user.
+ * @param total - IOU total amount in backend format (cents, no matter the currency)
+ * @param currency - This is used to know how many decimal places are valid to use when splitting the total
+ * @param isDefaultUser - Whether we are calculating the amount for the current user
  */
-function calculateAmount(numberOfParticipants, total, currency, isDefaultUser = false) {
+function calculateAmount(numberOfParticipants: number, total: number, currency: string, isDefaultUser = false): number {
     // Since the backend can maximum store 2 decimal places, any currency with more than 2 decimals
     // has to be capped to 2 decimal places
     const currencyUnit = Math.min(100, CurrencyUtils.getCurrencyUnit(currency));
@@ -34,35 +33,32 @@ function calculateAmount(numberOfParticipants, total, currency, isDefaultUser =
  * For example: if user1 owes user2 $10, then we have: {ownerAccountID: user2, managerID: user1, total: $10 (a positive amount, owed to user2)}
  * If user1 requests $17 from user2, then we have: {ownerAccountID: user1, managerID: user2, total: $7 (still a positive amount, but now owed to user1)}
  *
- * @param {Object} iouReport
- * @param {Number} actorAccountID
- * @param {Number} amount
- * @param {String} currency
- * @param {String} isDeleting - whether the user is deleting the request
- * @returns {Object}
+ * @param isDeleting - whether the user is deleting the request
  */
-function updateIOUOwnerAndTotal(iouReport, actorAccountID, amount, currency, isDeleting = false) {
+function updateIOUOwnerAndTotal(iouReport: Report, actorAccountID: number, amount: number, currency: string, isDeleting = false): Report {
     if (currency !== iouReport.currency) {
         return iouReport;
     }
 
     // Make a copy so we don't mutate the original object
-    const iouReportUpdate = {...iouReport};
+    const iouReportUpdate: Report = {...iouReport};
 
-    if (actorAccountID === iouReport.ownerAccountID) {
-        iouReportUpdate.total += isDeleting ? -amount : amount;
-    } else {
-        iouReportUpdate.total += isDeleting ? amount : -amount;
-    }
+    if (iouReportUpdate.total) {
+        if (actorAccountID === iouReport.ownerAccountID) {
+            iouReportUpdate.total += isDeleting ? -amount : amount;
+        } else {
+            iouReportUpdate.total += isDeleting ? amount : -amount;
+        }
 
-    if (iouReportUpdate.total < 0) {
-        // The total sign has changed and hence we need to flip the manager and owner of the report.
-        iouReportUpdate.ownerAccountID = iouReport.managerID;
-        iouReportUpdate.managerID = iouReport.ownerAccountID;
-        iouReportUpdate.total = -iouReportUpdate.total;
-    }
+        if (iouReportUpdate.total < 0) {
+            // The total sign has changed and hence we need to flip the manager and owner of the report.
+            iouReportUpdate.ownerAccountID = iouReport.managerID;
+            iouReportUpdate.managerID = iouReport.ownerAccountID;
+            iouReportUpdate.total = -iouReportUpdate.total;
+        }
 
-    iouReportUpdate.hasOutstandingIOU = iouReportUpdate.total !== 0;
+        iouReportUpdate.hasOutstandingIOU = iouReportUpdate.total !== 0;
+    }
 
     return iouReportUpdate;
 }
@@ -70,23 +66,19 @@ function updateIOUOwnerAndTotal(iouReport, actorAccountID, amount, currency, isD
 /**
  * Returns whether or not an IOU report contains money requests in a different currency
  * that are either created or cancelled offline, and thus haven't been converted to the report's currency yet
- *
- * @param {Object} iouReport
- * @returns {Boolean}
  */
-function isIOUReportPendingCurrencyConversion(iouReport) {
-    const reportTransactions = TransactionUtils.getAllReportTransactions(iouReport.reportID);
-    const pendingRequestsInDifferentCurrency = _.filter(reportTransactions, (transaction) => transaction.pendingAction && TransactionUtils.getCurrency(transaction) !== iouReport.currency);
+function isIOUReportPendingCurrencyConversion(iouReport: Report): boolean {
+    const reportTransactions: Transaction[] = TransactionUtils.getAllReportTransactions(iouReport.reportID);
+    const pendingRequestsInDifferentCurrency = reportTransactions.filter((transaction) => transaction.pendingAction && TransactionUtils.getCurrency(transaction) !== iouReport.currency);
     return pendingRequestsInDifferentCurrency.length > 0;
 }
 
 /**
  * Checks if the iou type is one of request, send, or split.
- * @param {String} iouType
- * @returns {Boolean}
  */
-function isValidMoneyRequestType(iouType) {
-    return [CONST.IOU.MONEY_REQUEST_TYPE.REQUEST, CONST.IOU.MONEY_REQUEST_TYPE.SPLIT].includes(iouType);
+function isValidMoneyRequestType(iouType: string): boolean {
+    const moneyRequestType: string[] = [CONST.IOU.MONEY_REQUEST_TYPE.REQUEST, CONST.IOU.MONEY_REQUEST_TYPE.SPLIT];
+    return moneyRequestType.includes(iouType);
 }
 
 export {calculateAmount, updateIOUOwnerAndTotal, isIOUReportPendingCurrencyConversion, isValidMoneyRequestType};
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/KeyboardShortcut/index.js b/src/libs/KeyboardShortcut/index.js
index 37d85c7bfbfc..f91c81a1b856 100644
--- a/src/libs/KeyboardShortcut/index.js
+++ b/src/libs/KeyboardShortcut/index.js
@@ -83,6 +83,9 @@ _.each(CONST.KEYBOARD_SHORTCUTS, (shortcut) => {
  */
 function unsubscribe(displayName, callbackID) {
     eventHandlers[displayName] = _.reject(eventHandlers[displayName], (callback) => callback.id === callbackID);
+    if (_.has(documentedShortcuts, displayName) && _.size(eventHandlers[displayName]) === 0) {
+        delete documentedShortcuts[displayName];
+    }
 }
 
 /**
diff --git a/src/libs/LocaleDigitUtils.js b/src/libs/LocaleDigitUtils.ts
similarity index 68%
rename from src/libs/LocaleDigitUtils.js
rename to src/libs/LocaleDigitUtils.ts
index 23396f8d2fb6..e17620aa5427 100644
--- a/src/libs/LocaleDigitUtils.js
+++ b/src/libs/LocaleDigitUtils.ts
@@ -1,4 +1,4 @@
-import _ from 'underscore';
+import _ from 'lodash';
 
 import * as NumberFormatUtils from './NumberFormatUtils';
 
@@ -8,12 +8,12 @@ const INDEX_DECIMAL = 10;
 const INDEX_MINUS_SIGN = 11;
 const INDEX_GROUP = 12;
 
-const getLocaleDigits = _.memoize((locale) => {
-    const localeDigits = _.clone(STANDARD_DIGITS);
+const getLocaleDigits = _.memoize((locale: string): string[] => {
+    const localeDigits = [...STANDARD_DIGITS];
     for (let i = 0; i <= 9; i++) {
         localeDigits[i] = NumberFormatUtils.format(locale, i);
     }
-    _.forEach(NumberFormatUtils.formatToParts(locale, 1000000.5), (part) => {
+    NumberFormatUtils.formatToParts(locale, 1000000.5).forEach((part) => {
         switch (part.type) {
             case 'decimal':
                 localeDigits[INDEX_DECIMAL] = part.value;
@@ -34,15 +34,13 @@ const getLocaleDigits = _.memoize((locale) => {
 /**
  * Gets the locale digit corresponding to a standard digit.
  *
- * @param {String} locale
- * @param {String} digit - Character of a single standard digit . It may be "0" ~ "9" (digits),
+ * @param digit - Character of a single standard digit . It may be "0" ~ "9" (digits),
  * "," (group separator), "." (decimal separator) or "-" (minus sign).
- * @returns {String}
  *
  * @throws If `digit` is not a valid standard digit.
  */
-function toLocaleDigit(locale, digit) {
-    const index = _.indexOf(STANDARD_DIGITS, digit);
+function toLocaleDigit(locale: string, digit: string): string {
+    const index = STANDARD_DIGITS.indexOf(digit);
     if (index < 0) {
         throw new Error(`"${digit}" must be in ${JSON.stringify(STANDARD_DIGITS)}`);
     }
@@ -52,15 +50,13 @@ function toLocaleDigit(locale, digit) {
 /**
  * Gets the standard digit corresponding to a locale digit.
  *
- * @param {String} locale
- * @param {String} localeDigit - Character of a single locale digit. It may be **the localized version** of
+ * @param localeDigit - Character of a single locale digit. It may be **the localized version** of
  * "0" ~ "9" (digits), "," (group separator), "." (decimal separator) or "-" (minus sign).
- * @returns {String}
  *
  * @throws If `localeDigit` is not a valid locale digit.
  */
-function fromLocaleDigit(locale, localeDigit) {
-    const index = _.indexOf(getLocaleDigits(locale), localeDigit);
+function fromLocaleDigit(locale: string, localeDigit: string): string {
+    const index = getLocaleDigits(locale).indexOf(localeDigit);
     if (index < 0) {
         throw new Error(`"${localeDigit}" must be in ${JSON.stringify(getLocaleDigits(locale))}`);
     }
diff --git a/src/libs/LocalePhoneNumber.js b/src/libs/LocalePhoneNumber.ts
similarity index 82%
rename from src/libs/LocalePhoneNumber.js
rename to src/libs/LocalePhoneNumber.ts
index e5c7cbfa45ba..962040aee049 100644
--- a/src/libs/LocalePhoneNumber.js
+++ b/src/libs/LocalePhoneNumber.ts
@@ -3,20 +3,17 @@ import Str from 'expensify-common/lib/str';
 import {parsePhoneNumber} from 'awesome-phonenumber';
 import ONYXKEYS from '../ONYXKEYS';
 
-let countryCodeByIP;
+let countryCodeByIP: number;
 Onyx.connect({
     key: ONYXKEYS.COUNTRY_CODE,
-    callback: (val) => (countryCodeByIP = val || 1),
+    callback: (val) => (countryCodeByIP = val ?? 1),
 });
 
 /**
  * Returns a locally converted phone number for numbers from the same region
  * and an internationally converted phone number with the country code for numbers from other regions
- *
- * @param {String} number
- * @returns {String}
  */
-function formatPhoneNumber(number) {
+function formatPhoneNumber(number: string): string {
     if (!number) {
         return '';
     }
@@ -26,7 +23,7 @@ function formatPhoneNumber(number) {
 
     // return the string untouched if it's not a phone number
     if (!parsedPhoneNumber.valid) {
-        if (parsedPhoneNumber.number && parsedPhoneNumber.number.international) {
+        if (parsedPhoneNumber.number?.international) {
             return parsedPhoneNumber.number.international;
         }
         return numberWithoutSMSDomain;
diff --git a/src/libs/Localize/index.js b/src/libs/Localize/index.js
index 9878873377b8..db371301f43f 100644
--- a/src/libs/Localize/index.js
+++ b/src/libs/Localize/index.js
@@ -38,7 +38,7 @@ function init() {
  * Return translated string for given locale and phrase
  *
  * @param {String} [desiredLanguage] eg 'en', 'es-ES'
- * @param {String|Array} phraseKey
+ * @param {String} phraseKey
  * @param {Object} [phraseParameters] Parameters to supply if the phrase is a template literal.
  * @returns {String}
  */
@@ -47,15 +47,15 @@ function translate(desiredLanguage = CONST.LOCALES.DEFAULT, phraseKey, phrasePar
     let translatedPhrase;
 
     // Search phrase in full locale e.g. es-ES
-    const desiredLanguageDictionary = lodashGet(translations, desiredLanguage);
-    translatedPhrase = lodashGet(desiredLanguageDictionary, phraseKey);
+    const desiredLanguageDictionary = translations[desiredLanguage] || {};
+    translatedPhrase = desiredLanguageDictionary[phraseKey];
     if (translatedPhrase) {
         return Str.result(translatedPhrase, phraseParameters);
     }
 
     // Phrase is not found in full locale, search it in fallback language e.g. es
-    const fallbackLanguageDictionary = lodashGet(translations, languageAbbreviation);
-    translatedPhrase = lodashGet(fallbackLanguageDictionary, phraseKey);
+    const fallbackLanguageDictionary = translations[languageAbbreviation] || {};
+    translatedPhrase = fallbackLanguageDictionary[phraseKey];
     if (translatedPhrase) {
         return Str.result(translatedPhrase, phraseParameters);
     }
@@ -64,8 +64,8 @@ function translate(desiredLanguage = CONST.LOCALES.DEFAULT, phraseKey, phrasePar
     }
 
     // Phrase is not translated, search it in default language (en)
-    const defaultLanguageDictionary = lodashGet(translations, CONST.LOCALES.DEFAULT, {});
-    translatedPhrase = lodashGet(defaultLanguageDictionary, phraseKey);
+    const defaultLanguageDictionary = translations[CONST.LOCALES.DEFAULT] || {};
+    translatedPhrase = defaultLanguageDictionary[phraseKey];
     if (translatedPhrase) {
         return Str.result(translatedPhrase, phraseParameters);
     }
diff --git a/src/libs/Log.js b/src/libs/Log.ts
similarity index 70%
rename from src/libs/Log.js
rename to src/libs/Log.ts
index e51fb74aedd5..cf139eec2682 100644
--- a/src/libs/Log.js
+++ b/src/libs/Log.ts
@@ -1,45 +1,43 @@
 // Making an exception to this rule here since we don't need an "action" for Log and Log should just be used directly. Creating a Log
 // action would likely cause confusion about which one to use. But most other API methods should happen inside an action file.
 /* eslint-disable rulesdir/no-api-in-views */
+import {Merge} from 'type-fest';
 import Logger from 'expensify-common/lib/Logger';
 import getPlatform from './getPlatform';
 import pkg from '../../package.json';
 import requireParameters from './requireParameters';
 import * as Network from './Network';
 
-let timeout = null;
+let timeout: NodeJS.Timeout;
 
-/**
- * @param {Object} parameters
- * @param {String} parameters.expensifyCashAppVersion
- * @param {Object[]} parameters.logPacket
- * @returns {Promise}
- */
-function LogCommand(parameters) {
+type LogCommandParameters = {
+    expensifyCashAppVersion: string;
+    logPacket: string;
+};
+
+function LogCommand(parameters: LogCommandParameters): Promise<{requestID: string}> {
     const commandName = 'Log';
     requireParameters(['logPacket', 'expensifyCashAppVersion'], parameters, commandName);
 
     // Note: We are forcing Log to run since it requires no authToken and should only be queued when we are offline.
     // Non-cancellable request: during logout, when requests are cancelled, we don't want to cancel any remaining logs
-    return Network.post(commandName, {...parameters, forceNetworkRequest: true, canCancel: false});
+    return Network.post(commandName, {...parameters, forceNetworkRequest: true, canCancel: false}) as Promise<{requestID: string}>;
 }
 
+// eslint-disable-next-line
+type ServerLoggingCallbackOptions = {api_setCookie: boolean; logPacket: string};
+type RequestParams = Merge<ServerLoggingCallbackOptions, {shouldProcessImmediately: boolean; shouldRetry: boolean; expensifyCashAppVersion: string; parameters: string}>;
+
 /**
  * Network interface for logger.
- *
- * @param {Logger} logger
- * @param {Object} params
- * @param {Object} params.parameters
- * @param {String} params.message
- * @return {Promise}
  */
-function serverLoggingCallback(logger, params) {
-    const requestParams = params;
+function serverLoggingCallback(logger: Logger, params: ServerLoggingCallbackOptions): Promise<{requestID: string}> {
+    const requestParams = params as RequestParams;
     requestParams.shouldProcessImmediately = false;
     requestParams.shouldRetry = false;
     requestParams.expensifyCashAppVersion = `expensifyCash[${getPlatform()}]${pkg.version}`;
     if (requestParams.parameters) {
-        requestParams.parameters = JSON.stringify(params.parameters);
+        requestParams.parameters = JSON.stringify(requestParams.parameters);
     }
     clearTimeout(timeout);
     timeout = setTimeout(() => logger.info('Flushing logs older than 10 minutes', true, {}, true), 10 * 60 * 1000);
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/MoneyRequestUtils.js b/src/libs/MoneyRequestUtils.ts
similarity index 53%
rename from src/libs/MoneyRequestUtils.js
rename to src/libs/MoneyRequestUtils.ts
index e60eae0cdfe5..b8a6a3da303f 100644
--- a/src/libs/MoneyRequestUtils.js
+++ b/src/libs/MoneyRequestUtils.ts
@@ -1,47 +1,36 @@
-import lodashGet from 'lodash/get';
-import _ from 'underscore';
+import {ValueOf} from 'type-fest';
 import CONST from '../CONST';
 
 /**
  * Strip comma from the amount
- *
- * @param {String} amount
- * @returns {String}
  */
-function stripCommaFromAmount(amount) {
+function stripCommaFromAmount(amount: string): string {
     return amount.replace(/,/g, '');
 }
 
 /**
  * Strip spaces from the amount
- *
- * @param {String} amount
- * @returns {String}
  */
-function stripSpacesFromAmount(amount) {
+function stripSpacesFromAmount(amount: string): string {
     return amount.replace(/\s+/g, '');
 }
 
 /**
  * Adds a leading zero to the amount if user entered just the decimal separator
  *
- * @param {String} amount - Changed amount from user input
- * @returns {String}
+ * @param amount - Changed amount from user input
  */
-function addLeadingZero(amount) {
+function addLeadingZero(amount: string): string {
     return amount === '.' ? '0.' : amount;
 }
 
 /**
  * Calculate the length of the amount with leading zeroes
- *
- * @param {String} amount
- * @returns {Number}
  */
-function calculateAmountLength(amount) {
+function calculateAmountLength(amount: string): number {
     const leadingZeroes = amount.match(/^0+/);
-    const leadingZeroesLength = lodashGet(leadingZeroes, '[0].length', 0);
-    const absAmount = parseFloat((stripCommaFromAmount(amount) * 100).toFixed(2)).toString();
+    const leadingZeroesLength = leadingZeroes?.[0]?.length ?? 0;
+    const absAmount = parseFloat((Number(stripCommaFromAmount(amount)) * 100).toFixed(2)).toString();
 
     if (/\D/.test(absAmount)) {
         return CONST.IOU.AMOUNT_MAX_LENGTH + 1;
@@ -52,11 +41,8 @@ function calculateAmountLength(amount) {
 
 /**
  * Check if amount is a decimal up to 3 digits
- *
- * @param {String} amount
- * @returns {Boolean}
  */
-function validateAmount(amount) {
+function validateAmount(amount: string): boolean {
     const decimalNumberRegex = new RegExp(/^\d+(,\d+)*(\.\d{0,2})?$/, 'i');
     return amount === '' || (decimalNumberRegex.test(amount) && calculateAmountLength(amount) <= CONST.IOU.AMOUNT_MAX_LENGTH);
 }
@@ -64,13 +50,10 @@ function validateAmount(amount) {
 /**
  * Replaces each character by calling `convertFn`. If `convertFn` throws an error, then
  * the original character will be preserved.
- *
- * @param {String} text
- * @param {Function} convertFn - `fromLocaleDigit` or `toLocaleDigit`
- * @returns {String}
  */
-function replaceAllDigits(text, convertFn) {
-    return _.chain([...text])
+function replaceAllDigits(text: string, convertFn: (char: string) => string): string {
+    return text
+        .split('')
         .map((char) => {
             try {
                 return convertFn(char);
@@ -78,19 +61,21 @@ function replaceAllDigits(text, convertFn) {
                 return char;
             }
         })
-        .join('')
-        .value();
+        .join('');
 }
 
 /**
  * Check if distance request or not
- *
- * @param {String} iouType - `send` | `split` | `request`
- * @param {String} selectedTab - `manual` | `scan` | `distance`
- * @returns {Boolean}
  */
-function isDistanceRequest(iouType, selectedTab) {
+function isDistanceRequest(iouType: ValueOf<typeof CONST.IOU.MONEY_REQUEST_TYPE>, selectedTab: ValueOf<typeof CONST.TAB>): boolean {
     return iouType === CONST.IOU.MONEY_REQUEST_TYPE.REQUEST && selectedTab === CONST.TAB.DISTANCE;
 }
 
-export {stripCommaFromAmount, stripSpacesFromAmount, addLeadingZero, validateAmount, replaceAllDigits, isDistanceRequest};
+/**
+ * Check if scan request or not
+ */
+function isScanRequest(selectedTab: ValueOf<typeof CONST.TAB>): boolean {
+    return selectedTab === CONST.TAB.SCAN;
+}
+
+export {stripCommaFromAmount, stripSpacesFromAmount, addLeadingZero, validateAmount, replaceAllDigits, isDistanceRequest, isScanRequest};
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js
index e10e51b307e4..428550a43aa8 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';
@@ -39,6 +38,8 @@ import DemoSetupPage from '../../../pages/DemoSetupPage';
 
 let timezone;
 let currentAccountID;
+let isLoadingApp;
+
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (val) => {
@@ -65,17 +66,27 @@ 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.
         if (_.isObject(timezone) && timezone.automatic && timezone.selected !== currentTimezone) {
             timezone.selected = currentTimezone;
-            PersonalDetails.updateAutomaticTimezone(timezone);
+            PersonalDetails.updateAutomaticTimezone({
+                automatic: true,
+                selected: currentTimezone,
+            });
         }
     },
 });
 
+Onyx.connect({
+    key: ONYXKEYS.IS_LOADING_APP,
+    callback: (val) => {
+        isLoadingApp = val;
+    },
+});
+
 const RootStack = createCustomStackNavigator();
 
 // We want to delay the re-rendering for components(e.g. ReportActionCompose)
@@ -106,16 +117,6 @@ const propTypes = {
     /** The last Onyx update ID was applied to the client */
     lastUpdateIDAppliedToClient: PropTypes.number,
 
-    /** Information about any currently running demos */
-    demoInfo: PropTypes.shape({
-        saastr: PropTypes.shape({
-            isBeginningDemo: PropTypes.bool,
-        }),
-        sbe: PropTypes.shape({
-            isBeginningDemo: PropTypes.bool,
-        }),
-    }),
-
     ...windowDimensionsPropTypes,
 };
 
@@ -126,7 +127,6 @@ const defaultProps = {
     },
     lastOpenedPublicRoomID: null,
     lastUpdateIDAppliedToClient: null,
-    demoInfo: {},
 };
 
 class AuthScreens extends React.Component {
@@ -138,7 +138,13 @@ class AuthScreens extends React.Component {
 
     componentDidMount() {
         NetworkConnection.listenForReconnect();
-        NetworkConnection.onReconnect(() => App.reconnectApp(this.props.lastUpdateIDAppliedToClient));
+        NetworkConnection.onReconnect(() => {
+            if (isLoadingApp) {
+                App.openApp();
+            } else {
+                App.reconnectApp(this.props.lastUpdateIDAppliedToClient);
+            }
+        });
         PusherConnectionManager.init();
         Pusher.init({
             appKey: CONFIG.PUSHER.APP_KEY,
@@ -163,12 +169,6 @@ class AuthScreens extends React.Component {
         App.setUpPoliciesAndNavigate(this.props.session, !this.props.isSmallScreenWidth);
         App.redirectThirdPartyDesktopSignIn();
 
-        // Check if we should be running any demos immediately after signing in.
-        if (lodashGet(this.props.demoInfo, 'saastr.isBeginningDemo', false)) {
-            Navigation.navigate(ROUTES.SAASTR, CONST.NAVIGATION.TYPE.FORCED_UP);
-        } else if (lodashGet(this.props.demoInfo, 'sbe.isBeginningDemo', false)) {
-            Navigation.navigate(ROUTES.SBE, CONST.NAVIGATION.TYPE.FORCED_UP);
-        }
         if (this.props.lastOpenedPublicRoomID) {
             // Re-open the last opened public room if the user logged in from a public room link
             Report.openLastOpenedPublicRoom(this.props.lastOpenedPublicRoomID);
@@ -177,7 +177,7 @@ class AuthScreens extends React.Component {
         Timing.end(CONST.TIMING.HOMEPAGE_INITIAL_RENDER);
 
         const searchShortcutConfig = CONST.KEYBOARD_SHORTCUTS.SEARCH;
-        const groupShortcutConfig = CONST.KEYBOARD_SHORTCUTS.NEW_GROUP;
+        const chatShortcutConfig = CONST.KEYBOARD_SHORTCUTS.NEW_CHAT;
 
         // Listen for the key K being pressed so that focus can be given to
         // the chat switcher, or new group chat
@@ -196,18 +196,18 @@ class AuthScreens extends React.Component {
             searchShortcutConfig.modifiers,
             true,
         );
-        this.unsubscribeGroupShortcut = KeyboardShortcut.subscribe(
-            groupShortcutConfig.shortcutKey,
+        this.unsubscribeChatShortcut = KeyboardShortcut.subscribe(
+            chatShortcutConfig.shortcutKey,
             () => {
                 Modal.close(() => {
-                    if (Navigation.isActiveRoute(ROUTES.NEW_GROUP)) {
+                    if (Navigation.isActiveRoute(ROUTES.NEW)) {
                         return;
                     }
-                    Navigation.navigate(ROUTES.NEW_GROUP);
+                    Navigation.navigate(ROUTES.NEW);
                 });
             },
-            groupShortcutConfig.descriptionKey,
-            groupShortcutConfig.modifiers,
+            chatShortcutConfig.descriptionKey,
+            chatShortcutConfig.modifiers,
             true,
         );
     }
@@ -220,8 +220,8 @@ class AuthScreens extends React.Component {
         if (this.unsubscribeSearchShortcut) {
             this.unsubscribeSearchShortcut();
         }
-        if (this.unsubscribeGroupShortcut) {
-            this.unsubscribeGroupShortcut();
+        if (this.unsubscribeChatShortcut) {
+            this.unsubscribeChatShortcut();
         }
         Session.cleanupSession();
         clearInterval(this.interval);
@@ -344,8 +344,5 @@ export default compose(
         lastUpdateIDAppliedToClient: {
             key: ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT,
         },
-        demoInfo: {
-            key: ONYXKEYS.DEMO_INFO,
-        },
     }),
 )(AuthScreens);
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
index 2adaf0397a2c..6636702592c0 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators.js
@@ -13,765 +13,192 @@ const defaultSubRouteOptions = {
 /**
  * Create a modal stack navigator with an array of sub-screens.
  *
- * @param {Object[]} screens array of screen config objects
+ * @param {Object} screens key/value pairs where the key is the name of the screen and the value is a functon that returns the lazy-loaded component
  * @returns {Function}
  */
 function createModalStackNavigator(screens) {
     const ModalStackNavigator = createStackNavigator();
     return () => (
         <ModalStackNavigator.Navigator screenOptions={defaultSubRouteOptions}>
-            {_.map(screens, (screen) => (
+            {_.map(screens, (getComponent, name) => (
                 <ModalStackNavigator.Screen
-                    key={screen.name}
-                    name={screen.name}
-                    getComponent={screen.getComponent}
-                    initialParams={screen.initialParams}
+                    key={name}
+                    name={name}
+                    getComponent={getComponent}
                 />
             ))}
         </ModalStackNavigator.Navigator>
     );
 }
 
-// We use getComponent/require syntax so that file used by screens are not loaded until we need them.
-const MoneyRequestModalStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const MoneyRequestSelectorPage = require('../../../pages/iou/MoneyRequestSelectorPage').default;
-            return MoneyRequestSelectorPage;
-        },
-        name: 'Money_Request',
-    },
-    {
-        getComponent: () => {
-            const MoneyRequestEditAmountPage = require('../../../pages/iou/steps/NewRequestAmountPage').default;
-            return MoneyRequestEditAmountPage;
-        },
-        name: 'Money_Request_Amount',
-    },
-    {
-        getComponent: () => {
-            const MoneyRequestParticipantsPage = require('../../../pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage').default;
-            return MoneyRequestParticipantsPage;
-        },
-        name: 'Money_Request_Participants',
-    },
-    {
-        getComponent: () => {
-            const MoneyRequestConfirmPage = require('../../../pages/iou/steps/MoneyRequestConfirmPage').default;
-            return MoneyRequestConfirmPage;
-        },
-        name: 'Money_Request_Confirmation',
-    },
-    {
-        getComponent: () => {
-            const IOUCurrencySelection = require('../../../pages/iou/IOUCurrencySelection').default;
-            return IOUCurrencySelection;
-        },
-        name: 'Money_Request_Currency',
-    },
-    {
-        getComponent: () => {
-            const MoneyRequestDatePage = require('../../../pages/iou/MoneyRequestDatePage').default;
-            return MoneyRequestDatePage;
-        },
-        name: 'Money_Request_Date',
-    },
-    {
-        getComponent: () => {
-            const MoneyRequestDescriptionPage = require('../../../pages/iou/MoneyRequestDescriptionPage').default;
-            return MoneyRequestDescriptionPage;
-        },
-        name: 'Money_Request_Description',
-    },
-    {
-        getComponent: () => {
-            const MoneyRequestCategoryPage = require('../../../pages/iou/MoneyRequestCategoryPage').default;
-            return MoneyRequestCategoryPage;
-        },
-        name: 'Money_Request_Category',
-    },
-    {
-        getComponent: () => {
-            const MoneyRequestMerchantPage = require('../../../pages/iou/MoneyRequestMerchantPage').default;
-            return MoneyRequestMerchantPage;
-        },
-        name: 'Money_Request_Merchant',
-    },
-    {
-        getComponent: () => {
-            const AddPersonalBankAccountPage = require('../../../pages/AddPersonalBankAccountPage').default;
-            return AddPersonalBankAccountPage;
-        },
-        name: 'IOU_Send_Add_Bank_Account',
-    },
-    {
-        getComponent: () => {
-            const AddDebitCardPage = require('../../../pages/settings/Wallet/AddDebitCardPage').default;
-            return AddDebitCardPage;
-        },
-        name: 'IOU_Send_Add_Debit_Card',
-    },
-    {
-        getComponent: () => {
-            const EnablePaymentsPage = require('../../../pages/EnablePayments/EnablePaymentsPage').default;
-            return EnablePaymentsPage;
-        },
-        name: 'IOU_Send_Enable_Payments',
-    },
-    {
-        getComponent: () => {
-            const WaypointEditorPage = require('../../../pages/iou/WaypointEditorPage').default;
-            return WaypointEditorPage;
-        },
-        name: 'Money_Request_Waypoint',
-    },
-]);
-
-const SplitDetailsModalStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const SplitBillDetailsPage = require('../../../pages/iou/SplitBillDetailsPage').default;
-            return SplitBillDetailsPage;
-        },
-        name: 'SplitDetails_Root',
-    },
-]);
-
-const DetailsModalStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const DetailsPage = require('../../../pages/DetailsPage').default;
-            return DetailsPage;
-        },
-        name: 'Details_Root',
-    },
-]);
-
-const ProfileModalStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const ProfilePage = require('../../../pages/ProfilePage').default;
-            return ProfilePage;
-        },
-        name: 'Profile_Root',
-    },
-]);
-
-const ReportDetailsModalStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const ReportDetailsPage = require('../../../pages/ReportDetailsPage').default;
-            return ReportDetailsPage;
-        },
-        name: 'Report_Details_Root',
-    },
-    {
-        getComponent: () => {
-            const ShareCodePage = require('../../../pages/home/report/ReportDetailsShareCodePage').default;
-            return ShareCodePage;
-        },
-        name: 'Report_Details_Share_Code',
-    },
-]);
-
-const ReportSettingsModalStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const ReportSettingsPage = require('../../../pages/settings/Report/ReportSettingsPage').default;
-            return ReportSettingsPage;
-        },
-        name: 'Report_Settings_Root',
-    },
-    {
-        getComponent: () => {
-            const RoomNamePage = require('../../../pages/settings/Report/RoomNamePage').default;
-            return RoomNamePage;
-        },
-        name: 'Report_Settings_Room_Name',
-    },
-    {
-        getComponent: () => {
-            const NotificationPreferencesPage = require('../../../pages/settings/Report/NotificationPreferencePage').default;
-            return NotificationPreferencesPage;
-        },
-        name: 'Report_Settings_Notification_Preferences',
-    },
-    {
-        getComponent: () => {
-            const WriteCapabilityPage = require('../../../pages/settings/Report/WriteCapabilityPage').default;
-            return WriteCapabilityPage;
-        },
-        name: 'Report_Settings_Write_Capability',
-    },
-]);
-
-const TaskModalStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const TaskTitlePage = require('../../../pages/tasks/TaskTitlePage').default;
-            return TaskTitlePage;
-        },
-        name: 'Task_Title',
-    },
-    {
-        getComponent: () => {
-            const TaskDescriptionPage = require('../../../pages/tasks/TaskDescriptionPage').default;
-            return TaskDescriptionPage;
-        },
-        name: 'Task_Description',
-    },
-    {
-        getComponent: () => {
-            const TaskAssigneeSelectorPage = require('../../../pages/tasks/TaskAssigneeSelectorModal').default;
-            return TaskAssigneeSelectorPage;
-        },
-        name: 'Task_Assignee',
-    },
-]);
-
-const ReportWelcomeMessageModalStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const ReportWelcomeMessagePage = require('../../../pages/ReportWelcomeMessagePage').default;
-            return ReportWelcomeMessagePage;
-        },
-        name: 'Report_WelcomeMessage_Root',
-    },
-]);
-
-const ReportParticipantsModalStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const ReportParticipantsPage = require('../../../pages/ReportParticipantsPage').default;
-            return ReportParticipantsPage;
-        },
-        name: 'ReportParticipants_Root',
-    },
-]);
-
-const SearchModalStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const SearchPage = require('../../../pages/SearchPage').default;
-            return SearchPage;
-        },
-        name: 'Search_Root',
-    },
-]);
-
-const NewGroupModalStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const NewGroupPage = require('../../../pages/NewGroupPage').default;
-            return NewGroupPage;
-        },
-        name: 'NewGroup_Root',
-    },
-]);
-
-const NewChatModalStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const NewChatPage = require('../../../pages/NewChatPage').default;
-            return NewChatPage;
-        },
-        name: 'NewChat_Root',
-    },
-]);
-
-const NewTaskModalStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const NewTaskPage = require('../../../pages/tasks/NewTaskPage').default;
-            return NewTaskPage;
-        },
-        name: 'NewTask_Root',
-    },
-    {
-        getComponent: () => {
-            const NewTaskAssigneeSelectorPage = require('../../../pages/tasks/TaskAssigneeSelectorModal').default;
-            return NewTaskAssigneeSelectorPage;
-        },
-        name: 'NewTask_TaskAssigneeSelector',
-    },
-    {
-        getComponent: () => {
-            const NewTaskTaskShareDestinationPage = require('../../../pages/tasks/TaskShareDestinationSelectorModal').default;
-            return NewTaskTaskShareDestinationPage;
-        },
-        name: 'NewTask_TaskShareDestinationSelector',
-    },
-    {
-        getComponent: () => {
-            const NewTaskDetailsPage = require('../../../pages/tasks/NewTaskDetailsPage').default;
-            return NewTaskDetailsPage;
-        },
-        name: 'NewTask_Details',
-    },
-    {
-        getComponent: () => {
-            const NewTaskTitlePage = require('../../../pages/tasks/NewTaskTitlePage').default;
-            return NewTaskTitlePage;
-        },
-        name: 'NewTask_Title',
-    },
-    {
-        getComponent: () => {
-            const NewTaskDescriptionPage = require('../../../pages/tasks/NewTaskDescriptionPage').default;
-            return NewTaskDescriptionPage;
-        },
-        name: 'NewTask_Description',
-    },
-]);
-
-const NewTeachersUniteNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const SaveTheWorldPage = require('../../../pages/TeachersUnite/SaveTheWorldPage').default;
-            return SaveTheWorldPage;
-        },
-        name: 'SaveTheWorld_Root',
-    },
-    {
-        getComponent: () => {
-            const KnowATeacherPage = require('../../../pages/TeachersUnite/KnowATeacherPage').default;
-            return KnowATeacherPage;
-        },
-        name: 'I_Know_A_Teacher',
-    },
-    {
-        getComponent: () => {
-            const IntroSchoolPrincipalPage = require('../../../pages/TeachersUnite/IntroSchoolPrincipalPage').default;
-            return IntroSchoolPrincipalPage;
-        },
-        name: 'Intro_School_Principal',
-    },
-    {
-        getComponent: () => {
-            const ImTeacherPage = require('../../../pages/TeachersUnite/ImTeacherPage').default;
-            return ImTeacherPage;
-        },
-        name: 'I_Am_A_Teacher',
-    },
-]);
-
-const SettingsModalStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const SettingsInitialPage = require('../../../pages/settings/InitialSettingsPage').default;
-            return SettingsInitialPage;
-        },
-        name: 'Settings_Root',
-    },
-    {
-        getComponent: () => {
-            const ShareCodePage = require('../../../pages/ShareCodePage').default;
-            return ShareCodePage;
-        },
-        name: 'Settings_Share_Code',
-    },
-    {
-        getComponent: () => {
-            const SettingsWorkspacesPage = require('../../../pages/workspace/WorkspacesListPage').default;
-            return SettingsWorkspacesPage;
-        },
-        name: SCREENS.SETTINGS.WORKSPACES,
-    },
-    {
-        getComponent: () => {
-            const SettingsProfilePage = require('../../../pages/settings/Profile/ProfilePage').default;
-            return SettingsProfilePage;
-        },
-        name: 'Settings_Profile',
-    },
-    {
-        getComponent: () => {
-            const SettingsPronounsPage = require('../../../pages/settings/Profile/PronounsPage').default;
-            return SettingsPronounsPage;
-        },
-        name: 'Settings_Pronouns',
-    },
-    {
-        getComponent: () => {
-            const SettingsDisplayNamePage = require('../../../pages/settings/Profile/DisplayNamePage').default;
-            return SettingsDisplayNamePage;
-        },
-        name: 'Settings_Display_Name',
-    },
-    {
-        getComponent: () => {
-            const SettingsTimezoneInitialPage = require('../../../pages/settings/Profile/TimezoneInitialPage').default;
-            return SettingsTimezoneInitialPage;
-        },
-        name: 'Settings_Timezone',
-    },
-    {
-        getComponent: () => {
-            const SettingsTimezoneSelectPage = require('../../../pages/settings/Profile/TimezoneSelectPage').default;
-            return SettingsTimezoneSelectPage;
-        },
-        name: 'Settings_Timezone_Select',
-    },
-    {
-        getComponent: () => {
-            const SettingsPersonalDetailsInitialPage = require('../../../pages/settings/Profile/PersonalDetails/PersonalDetailsInitialPage').default;
-            return SettingsPersonalDetailsInitialPage;
-        },
-        name: 'Settings_PersonalDetails_Initial',
-    },
-    {
-        getComponent: () => {
-            const SettingsLegalNamePage = require('../../../pages/settings/Profile/PersonalDetails/LegalNamePage').default;
-            return SettingsLegalNamePage;
-        },
-        name: 'Settings_PersonalDetails_LegalName',
-    },
-    {
-        getComponent: () => {
-            const SettingsDateOfBirthPage = require('../../../pages/settings/Profile/PersonalDetails/DateOfBirthPage').default;
-            return SettingsDateOfBirthPage;
-        },
-        name: 'Settings_PersonalDetails_DateOfBirth',
-    },
-    {
-        getComponent: () => {
-            const SettingsAddressPage = require('../../../pages/settings/Profile/PersonalDetails/AddressPage').default;
-            return SettingsAddressPage;
-        },
-        name: 'Settings_PersonalDetails_Address',
-    },
-    {
-        getComponent: () => {
-            const SettingsContactMethodsPage = require('../../../pages/settings/Profile/Contacts/ContactMethodsPage').default;
-            return SettingsContactMethodsPage;
-        },
-        name: 'Settings_ContactMethods',
-    },
-    {
-        getComponent: () => {
-            const SettingsContactMethodDetailsPage = require('../../../pages/settings/Profile/Contacts/ContactMethodDetailsPage').default;
-            return SettingsContactMethodDetailsPage;
-        },
-        name: 'Settings_ContactMethodDetails',
-    },
-    {
-        getComponent: () => {
-            const SettingsNewContactMethodPage = require('../../../pages/settings/Profile/Contacts/NewContactMethodPage').default;
-            return SettingsNewContactMethodPage;
-        },
-        name: 'Settings_NewContactMethod',
-    },
-    {
-        getComponent: () => {
-            const SettingsPreferencesPage = require('../../../pages/settings/Preferences/PreferencesPage').default;
-            return SettingsPreferencesPage;
-        },
-        name: SCREENS.SETTINGS.PREFERENCES,
-    },
-    {
-        getComponent: () => {
-            const SettingsPreferencesPriorityModePage = require('../../../pages/settings/Preferences/PriorityModePage').default;
-            return SettingsPreferencesPriorityModePage;
-        },
-        name: 'Settings_Preferences_PriorityMode',
-    },
-    {
-        getComponent: () => {
-            const SettingsPreferencesLanguagePage = require('../../../pages/settings/Preferences/LanguagePage').default;
-            return SettingsPreferencesLanguagePage;
-        },
-        name: 'Settings_Preferences_Language',
-    },
+const MoneyRequestModalStackNavigator = createModalStackNavigator({
+    Money_Request: () => require('../../../pages/iou/MoneyRequestSelectorPage').default,
+    Money_Request_Amount: () => require('../../../pages/iou/steps/NewRequestAmountPage').default,
+    Money_Request_Participants: () => require('../../../pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage').default,
+    Money_Request_Confirmation: () => require('../../../pages/iou/steps/MoneyRequestConfirmPage').default,
+    Money_Request_Currency: () => require('../../../pages/iou/IOUCurrencySelection').default,
+    Money_Request_Date: () => require('../../../pages/iou/MoneyRequestDatePage').default,
+    Money_Request_Description: () => require('../../../pages/iou/MoneyRequestDescriptionPage').default,
+    Money_Request_Category: () => require('../../../pages/iou/MoneyRequestCategoryPage').default,
+    Money_Request_Tag: () => require('../../../pages/iou/MoneyRequestTagPage').default,
+    Money_Request_Merchant: () => require('../../../pages/iou/MoneyRequestMerchantPage').default,
+    IOU_Send_Add_Bank_Account: () => require('../../../pages/AddPersonalBankAccountPage').default,
+    IOU_Send_Add_Debit_Card: () => require('../../../pages/settings/Wallet/AddDebitCardPage').default,
+    IOU_Send_Enable_Payments: () => require('../../../pages/EnablePayments/EnablePaymentsPage').default,
+    Money_Request_Waypoint: () => require('../../../pages/iou/NewDistanceRequestWaypointEditorPage').default,
+    Money_Request_Edit_Waypoint: () => require('../../../pages/iou/MoneyRequestEditWaypointPage').default,
+    Money_Request_Distance: () => require('../../../pages/iou/NewDistanceRequestPage').default,
+    Money_Request_Receipt: () => require('../../../pages/EditRequestReceiptPage').default,
+});
+
+const SplitDetailsModalStackNavigator = createModalStackNavigator({
+    SplitDetails_Root: () => require('../../../pages/iou/SplitBillDetailsPage').default,
+});
+
+const DetailsModalStackNavigator = createModalStackNavigator({
+    Details_Root: () => require('../../../pages/DetailsPage').default,
+});
+
+const ProfileModalStackNavigator = createModalStackNavigator({
+    Profile_Root: () => require('../../../pages/ProfilePage').default,
+});
+
+const ReportDetailsModalStackNavigator = createModalStackNavigator({
+    Report_Details_Root: () => require('../../../pages/ReportDetailsPage').default,
+    Report_Details_Share_Code: () => require('../../../pages/home/report/ReportDetailsShareCodePage').default,
+});
+
+const ReportSettingsModalStackNavigator = createModalStackNavigator({
+    Report_Settings_Root: () => require('../../../pages/settings/Report/ReportSettingsPage').default,
+    Report_Settings_Room_Name: () => require('../../../pages/settings/Report/RoomNamePage').default,
+    Report_Settings_Notification_Preferences: () => require('../../../pages/settings/Report/NotificationPreferencePage').default,
+    Report_Settings_Write_Capability: () => require('../../../pages/settings/Report/WriteCapabilityPage').default,
+});
+
+const TaskModalStackNavigator = createModalStackNavigator({
+    Task_Title: () => require('../../../pages/tasks/TaskTitlePage').default,
+    Task_Description: () => require('../../../pages/tasks/TaskDescriptionPage').default,
+    Task_Assignee: () => require('../../../pages/tasks/TaskAssigneeSelectorModal').default,
+});
+
+const ReportWelcomeMessageModalStackNavigator = createModalStackNavigator({
+    Report_WelcomeMessage_Root: () => require('../../../pages/ReportWelcomeMessagePage').default,
+});
+
+const ReportParticipantsModalStackNavigator = createModalStackNavigator({
+    ReportParticipants_Root: () => require('../../../pages/ReportParticipantsPage').default,
+});
+
+const SearchModalStackNavigator = createModalStackNavigator({
+    Search_Root: () => require('../../../pages/SearchPage').default,
+});
+
+const NewChatModalStackNavigator = createModalStackNavigator({
+    NewChat_Root: () => require('../../../pages/NewChatSelectorPage').default,
+});
+
+const NewTaskModalStackNavigator = createModalStackNavigator({
+    NewTask_Root: () => require('../../../pages/tasks/NewTaskPage').default,
+    NewTask_TaskAssigneeSelector: () => require('../../../pages/tasks/TaskAssigneeSelectorModal').default,
+    NewTask_TaskShareDestinationSelector: () => require('../../../pages/tasks/TaskShareDestinationSelectorModal').default,
+    NewTask_Details: () => require('../../../pages/tasks/NewTaskDetailsPage').default,
+    NewTask_Title: () => require('../../../pages/tasks/NewTaskTitlePage').default,
+    NewTask_Description: () => require('../../../pages/tasks/NewTaskDescriptionPage').default,
+});
+
+const NewTeachersUniteNavigator = createModalStackNavigator({
+    [SCREENS.SAVE_THE_WORLD.ROOT]: () => require('../../../pages/TeachersUnite/SaveTheWorldPage').default,
+    I_Know_A_Teacher: () => require('../../../pages/TeachersUnite/KnowATeacherPage').default,
+    Intro_School_Principal: () => require('../../../pages/TeachersUnite/ImTeacherPage').default,
+    I_Am_A_Teacher: () => require('../../../pages/TeachersUnite/ImTeacherPage').default,
+});
+
+const SettingsModalStackNavigator = createModalStackNavigator({
+    [SCREENS.SETTINGS.ROOT]: () => require('../../../pages/settings/InitialSettingsPage').default,
+    Settings_Share_Code: () => require('../../../pages/ShareCodePage').default,
+    [SCREENS.SETTINGS.WORKSPACES]: () => require('../../../pages/workspace/WorkspacesListPage').default,
+    Settings_Profile: () => require('../../../pages/settings/Profile/ProfilePage').default,
+    Settings_Pronouns: () => require('../../../pages/settings/Profile/PronounsPage').default,
+    Settings_Display_Name: () => require('../../../pages/settings/Profile/DisplayNamePage').default,
+    Settings_Timezone: () => require('../../../pages/settings/Profile/TimezoneInitialPage').default,
+    Settings_Timezone_Select: () => require('../../../pages/settings/Profile/TimezoneSelectPage').default,
+    Settings_PersonalDetails_Initial: () => require('../../../pages/settings/Profile/PersonalDetails/PersonalDetailsInitialPage').default,
+    Settings_PersonalDetails_LegalName: () => require('../../../pages/settings/Profile/PersonalDetails/LegalNamePage').default,
+    Settings_PersonalDetails_DateOfBirth: () => require('../../../pages/settings/Profile/PersonalDetails/DateOfBirthPage').default,
+    Settings_PersonalDetails_Address: () => require('../../../pages/settings/Profile/PersonalDetails/AddressPage').default,
+    Settings_PersonalDetails_Address_Country: () => require('../../../pages/settings/Profile/PersonalDetails/CountrySelectionPage').default,
+    Settings_ContactMethods: () => require('../../../pages/settings/Profile/Contacts/ContactMethodsPage').default,
+    Settings_ContactMethodDetails: () => require('../../../pages/settings/Profile/Contacts/ContactMethodDetailsPage').default,
+    Settings_NewContactMethod: () => require('../../../pages/settings/Profile/Contacts/NewContactMethodPage').default,
+    [SCREENS.SETTINGS.PREFERENCES]: () => require('../../../pages/settings/Preferences/PreferencesPage').default,
+    Settings_Preferences_PriorityMode: () => require('../../../pages/settings/Preferences/PriorityModePage').default,
+    Settings_Preferences_Language: () => require('../../../pages/settings/Preferences/LanguagePage').default,
     // Will be uncommented as part of https://github.com/Expensify/App/issues/21670
-    // {
-    //     getComponent: () => {
-    //         const SettingsPreferencesThemePage = require('../../../pages/settings/Preferences/ThemePage').default;
-    //         return SettingsPreferencesThemePage;
-    //     },
-    //     name: 'Settings_Preferences_Theme',
-    // },
-    {
-        getComponent: () => {
-            const SettingsCloseAccountPage = require('../../../pages/settings/Security/CloseAccountPage').default;
-            return SettingsCloseAccountPage;
-        },
-        name: 'Settings_Close',
-    },
-    {
-        getComponent: () => {
-            const SettingsSecurityPage = require('../../../pages/settings/Security/SecuritySettingsPage').default;
-            return SettingsSecurityPage;
-        },
-        name: 'Settings_Security',
-    },
-    {
-        getComponent: () => {
-            const SettingsAboutPage = require('../../../pages/settings/AboutPage/AboutPage').default;
-            return SettingsAboutPage;
-        },
-        name: 'Settings_About',
-    },
-    {
-        getComponent: () => {
-            const SettingsAppDownloadLinks = require('../../../pages/settings/AppDownloadLinks').default;
-            return SettingsAppDownloadLinks;
-        },
-        name: 'Settings_App_Download_Links',
-    },
-    {
-        getComponent: () => {
-            const SettingsLoungeAccessPage = require('../../../pages/settings/Profile/LoungeAccessPage').default;
-            return SettingsLoungeAccessPage;
-        },
-        name: 'Settings_Lounge_Access',
-    },
-    {
-        getComponent: () => {
-            const SettingsWalletPage = require('../../../pages/settings/Wallet/WalletPage').default;
-            return SettingsWalletPage;
-        },
-        name: 'Settings_Wallet',
-    },
-    {
-        getComponent: () => {
-            const TransferBalancePage = require('../../../pages/settings/Wallet/TransferBalancePage').default;
-            return TransferBalancePage;
-        },
-        name: 'Settings_Wallet_Transfer_Balance',
-    },
-    {
-        getComponent: () => {
-            const ChooseTransferAccountPage = require('../../../pages/settings/Wallet/ChooseTransferAccountPage').default;
-            return ChooseTransferAccountPage;
-        },
-        name: 'Settings_Wallet_Choose_Transfer_Account',
-    },
-    {
-        getComponent: () => {
-            const SettingsAddPayPalMePage = require('../../../pages/settings/Wallet/AddPayPalMePage').default;
-            return SettingsAddPayPalMePage;
-        },
-        name: 'Settings_Add_Paypal_Me',
-    },
-    {
-        getComponent: () => {
-            const EnablePaymentsPage = require('../../../pages/EnablePayments/EnablePaymentsPage').default;
-            return EnablePaymentsPage;
-        },
-        name: 'Settings_Wallet_EnablePayments',
-    },
-    {
-        getComponent: () => {
-            const AddDebitCardPage = require('../../../pages/settings/Wallet/AddDebitCardPage').default;
-            return AddDebitCardPage;
-        },
-        name: 'Settings_Add_Debit_Card',
-    },
-    {
-        getComponent: () => {
-            const AddPersonalBankAccountPage = require('../../../pages/AddPersonalBankAccountPage').default;
-            return AddPersonalBankAccountPage;
-        },
-        name: 'Settings_Add_Bank_Account',
-    },
-    {
-        getComponent: () => {
-            const SettingsStatus = require('../../../pages/settings/Profile/CustomStatus/StatusPage').default;
-            return SettingsStatus;
-        },
-        name: 'Settings_Status',
-    },
-    {
-        getComponent: () => {
-            const SettingsStatusSet = require('../../../pages/settings/Profile/CustomStatus/StatusSetPage').default;
-            return SettingsStatusSet;
-        },
-        name: 'Settings_Status_Set',
-    },
-    {
-        getComponent: () => {
-            const WorkspaceInitialPage = require('../../../pages/workspace/WorkspaceInitialPage').default;
-            return WorkspaceInitialPage;
-        },
-        name: 'Workspace_Initial',
-    },
-    {
-        getComponent: () => {
-            const WorkspaceSettingsPage = require('../../../pages/workspace/WorkspaceSettingsPage').default;
-            return WorkspaceSettingsPage;
-        },
-        name: 'Workspace_Settings',
-    },
-    {
-        getComponent: () => {
-            const WorkspaceCardPage = require('../../../pages/workspace/card/WorkspaceCardPage').default;
-            return WorkspaceCardPage;
-        },
-        name: 'Workspace_Card',
-    },
-    {
-        getComponent: () => {
-            const WorkspaceReimbursePage = require('../../../pages/workspace/reimburse/WorkspaceReimbursePage').default;
-            return WorkspaceReimbursePage;
-        },
-        name: 'Workspace_Reimburse',
-    },
-    {
-        getComponent: () => {
-            const WorkspaceRateAndUnitPage = require('../../../pages/workspace/reimburse/WorkspaceRateAndUnitPage').default;
-            return WorkspaceRateAndUnitPage;
-        },
-        name: 'Workspace_RateAndUnit',
-    },
-    {
-        getComponent: () => {
-            const WorkspaceBillsPage = require('../../../pages/workspace/bills/WorkspaceBillsPage').default;
-            return WorkspaceBillsPage;
-        },
-        name: 'Workspace_Bills',
-    },
-    {
-        getComponent: () => {
-            const WorkspaceInvoicesPage = require('../../../pages/workspace/invoices/WorkspaceInvoicesPage').default;
-            return WorkspaceInvoicesPage;
-        },
-        name: 'Workspace_Invoices',
-    },
-    {
-        getComponent: () => {
-            const WorkspaceTravelPage = require('../../../pages/workspace/travel/WorkspaceTravelPage').default;
-            return WorkspaceTravelPage;
-        },
-        name: 'Workspace_Travel',
-    },
-    {
-        getComponent: () => {
-            const WorkspaceMembersPage = require('../../../pages/workspace/WorkspaceMembersPage').default;
-            return WorkspaceMembersPage;
-        },
-        name: 'Workspace_Members',
-    },
-    {
-        getComponent: () => {
-            const WorkspaceInvitePage = require('../../../pages/workspace/WorkspaceInvitePage').default;
-            return WorkspaceInvitePage;
-        },
-        name: 'Workspace_Invite',
-    },
-    {
-        getComponent: () => {
-            const WorkspaceInviteMessagePage = require('../../../pages/workspace/WorkspaceInviteMessagePage').default;
-            return WorkspaceInviteMessagePage;
-        },
-        name: 'Workspace_Invite_Message',
-    },
-    {
-        getComponent: () => {
-            const WorkspaceNewRoomPage = require('../../../pages/workspace/WorkspaceNewRoomPage').default;
-            return WorkspaceNewRoomPage;
-        },
-        name: 'Workspace_NewRoom',
-    },
-    {
-        getComponent: () => {
-            const ReimbursementAccountPage = require('../../../pages/ReimbursementAccount/ReimbursementAccountPage').default;
-            return ReimbursementAccountPage;
-        },
-        name: 'ReimbursementAccount',
-        initialParams: {stepToOpen: ''},
-    },
-    {
-        getComponent: () => {
-            const GetAssistancePage = require('../../../pages/GetAssistancePage').default;
-            return GetAssistancePage;
-        },
-        name: 'GetAssistance',
-    },
-    {
-        getComponent: () => {
-            const SettingsTwoFactorAuth = require('../../../pages/settings/Security/TwoFactorAuth/TwoFactorAuthPage').default;
-            return SettingsTwoFactorAuth;
-        },
-        name: 'Settings_TwoFactorAuth',
-    },
-]);
-
-const EnablePaymentsStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const EnablePaymentsPage = require('../../../pages/EnablePayments/EnablePaymentsPage').default;
-            return EnablePaymentsPage;
-        },
-        name: 'EnablePayments_Root',
-    },
-]);
-
-const AddPersonalBankAccountModalStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const AddPersonalBankAccountPage = require('../../../pages/AddPersonalBankAccountPage').default;
-            return AddPersonalBankAccountPage;
-        },
-        name: 'AddPersonalBankAccount_Root',
-    },
-]);
-
-const ReimbursementAccountModalStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const ReimbursementAccountPage = require('../../../pages/ReimbursementAccount/ReimbursementAccountPage').default;
-            return ReimbursementAccountPage;
-        },
-        name: 'ReimbursementAccount_Root',
-    },
-]);
-
-const WalletStatementStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const WalletStatementPage = require('../../../pages/wallet/WalletStatementPage').default;
-            return WalletStatementPage;
-        },
-        name: 'WalletStatement_Root',
-    },
-]);
-
-const FlagCommentStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const FlagCommentPage = require('../../../pages/FlagCommentPage').default;
-            return FlagCommentPage;
-        },
-        name: 'FlagComment_Root',
-    },
-]);
-
-const EditRequestStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const EditRequestPage = require('../../../pages/EditRequestPage').default;
-            return EditRequestPage;
-        },
-        name: 'EditRequest_Root',
-    },
-    {
-        getComponent: () => {
-            const IOUCurrencySelection = require('../../../pages/iou/IOUCurrencySelection').default;
-            return IOUCurrencySelection;
-        },
-        name: 'EditRequest_Currency',
-    },
-]);
-
-const SignInModalStackNavigator = createModalStackNavigator([
-    {
-        getComponent: () => {
-            const SignInModal = require('../../../pages/signin/SignInModal').default;
-            return SignInModal;
-        },
-        name: 'SignIn_Root',
-    },
-]);
+    // Settings_Preferences_Theme: () => require('../../../pages/settings/Preferences/ThemePage').default,
+    Settings_Close: () => require('../../../pages/settings/Security/CloseAccountPage').default,
+    [SCREENS.SETTINGS.SECURITY]: () => require('../../../pages/settings/Security/SecuritySettingsPage').default,
+    Settings_About: () => require('../../../pages/settings/AboutPage/AboutPage').default,
+    Settings_App_Download_Links: () => require('../../../pages/settings/AppDownloadLinks').default,
+    Settings_Lounge_Access: () => require('../../../pages/settings/Profile/LoungeAccessPage').default,
+    Settings_Wallet: () => require('../../../pages/settings/Wallet/WalletPage').default,
+    Settings_Wallet_DomainCards: () => require('../../../pages/settings/Wallet/ExpensifyCardPage').default,
+    Settings_Wallet_Transfer_Balance: () => require('../../../pages/settings/Wallet/TransferBalancePage').default,
+    Settings_Wallet_Choose_Transfer_Account: () => require('../../../pages/settings/Wallet/ChooseTransferAccountPage').default,
+    Settings_Wallet_EnablePayments: () => require('../../../pages/EnablePayments/EnablePaymentsPage').default,
+    Settings_Add_Debit_Card: () => require('../../../pages/settings/Wallet/AddDebitCardPage').default,
+    Settings_Add_Bank_Account: () => require('../../../pages/AddPersonalBankAccountPage').default,
+    [SCREENS.SETTINGS.STATUS]: () => require('../../../pages/settings/Profile/CustomStatus/StatusPage').default,
+    Settings_Status_Set: () => require('../../../pages/settings/Profile/CustomStatus/StatusSetPage').default,
+    Workspace_Initial: () => require('../../../pages/workspace/WorkspaceInitialPage').default,
+    Workspace_Settings: () => require('../../../pages/workspace/WorkspaceSettingsPage').default,
+    Workspace_Card: () => require('../../../pages/workspace/card/WorkspaceCardPage').default,
+    Workspace_Reimburse: () => require('../../../pages/workspace/reimburse/WorkspaceReimbursePage').default,
+    Workspace_RateAndUnit: () => require('../../../pages/workspace/reimburse/WorkspaceRateAndUnitPage').default,
+    Workspace_Bills: () => require('../../../pages/workspace/bills/WorkspaceBillsPage').default,
+    Workspace_Invoices: () => require('../../../pages/workspace/invoices/WorkspaceInvoicesPage').default,
+    Workspace_Travel: () => require('../../../pages/workspace/travel/WorkspaceTravelPage').default,
+    Workspace_Members: () => require('../../../pages/workspace/WorkspaceMembersPage').default,
+    Workspace_Invite: () => require('../../../pages/workspace/WorkspaceInvitePage').default,
+    Workspace_Invite_Message: () => require('../../../pages/workspace/WorkspaceInviteMessagePage').default,
+    ReimbursementAccount: () => require('../../../pages/ReimbursementAccount/ReimbursementAccountPage').default,
+    GetAssistance: () => require('../../../pages/GetAssistancePage').default,
+    Settings_TwoFactorAuth: () => require('../../../pages/settings/Security/TwoFactorAuth/TwoFactorAuthPage').default,
+});
+
+const EnablePaymentsStackNavigator = createModalStackNavigator({
+    EnablePayments_Root: () => require('../../../pages/EnablePayments/EnablePaymentsPage').default,
+});
+
+const AddPersonalBankAccountModalStackNavigator = createModalStackNavigator({
+    AddPersonalBankAccount_Root: () => require('../../../pages/AddPersonalBankAccountPage').default,
+});
+
+const ReimbursementAccountModalStackNavigator = createModalStackNavigator({
+    ReimbursementAccount_Root: () => require('../../../pages/ReimbursementAccount/ReimbursementAccountPage').default,
+});
+
+const WalletStatementStackNavigator = createModalStackNavigator({
+    WalletStatement_Root: () => require('../../../pages/wallet/WalletStatementPage').default,
+});
+
+const FlagCommentStackNavigator = createModalStackNavigator({
+    FlagComment_Root: () => require('../../../pages/FlagCommentPage').default,
+});
+
+const EditRequestStackNavigator = createModalStackNavigator({
+    EditRequest_Root: () => require('../../../pages/EditRequestPage').default,
+    EditRequest_Currency: () => require('../../../pages/iou/IOUCurrencySelection').default,
+});
+
+const PrivateNotesModalStackNavigator = createModalStackNavigator({
+    PrivateNotes_View: () => require('../../../pages/PrivateNotes/PrivateNotesViewPage').default,
+    PrivateNotes_List: () => require('../../../pages/PrivateNotes/PrivateNotesListPage').default,
+    PrivateNotes_Edit: () => require('../../../pages/PrivateNotes/PrivateNotesEditPage').default,
+});
+
+const SignInModalStackNavigator = createModalStackNavigator({
+    SignIn_Root: () => require('../../../pages/signin/SignInModal').default,
+});
 
 export {
     MoneyRequestModalStackNavigator,
@@ -784,7 +211,6 @@ export {
     ReportWelcomeMessageModalStackNavigator,
     ReportParticipantsModalStackNavigator,
     SearchModalStackNavigator,
-    NewGroupModalStackNavigator,
     NewChatModalStackNavigator,
     NewTaskModalStackNavigator,
     SettingsModalStackNavigator,
@@ -794,6 +220,7 @@ export {
     WalletStatementStackNavigator,
     FlagCommentStackNavigator,
     EditRequestStackNavigator,
+    PrivateNotesModalStackNavigator,
     NewTeachersUniteNavigator,
     SignInModalStackNavigator,
 };
diff --git a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
index f6ea89ecd088..27a15fa3d763 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
+++ b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.js
@@ -32,14 +32,6 @@ function RightModalNavigator(props) {
                         name="NewChat"
                         component={ModalStackNavigators.NewChatModalStackNavigator}
                     />
-                    <Stack.Screen
-                        name="NewGroup"
-                        component={ModalStackNavigators.NewGroupModalStackNavigator}
-                        options={{
-                            // Disable animation for this screen because it causes an animation glitch when using shortcuts
-                            animationEnabled: false,
-                        }}
-                    />
                     <Stack.Screen
                         name="Search"
                         component={ModalStackNavigators.SearchModalStackNavigator}
@@ -116,6 +108,10 @@ function RightModalNavigator(props) {
                         name="SignIn"
                         component={ModalStackNavigators.SignInModalStackNavigator}
                     />
+                    <Stack.Screen
+                        name="Private_Notes"
+                        component={ModalStackNavigators.PrivateNotesModalStackNavigator}
+                    />
                 </Stack.Navigator>
             </View>
         </NoDropZone>
diff --git a/src/libs/Navigation/AppNavigator/ReportScreenIDSetter.js b/src/libs/Navigation/AppNavigator/ReportScreenIDSetter.js
new file mode 100644
index 000000000000..24f855645870
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/ReportScreenIDSetter.js
@@ -0,0 +1,121 @@
+import {useEffect} from 'react';
+import PropTypes from 'prop-types';
+import lodashGet from 'lodash/get';
+import {withOnyx} from 'react-native-onyx';
+import ONYXKEYS from '../../../ONYXKEYS';
+import * as ReportUtils from '../../ReportUtils';
+import reportPropTypes from '../../../pages/reportPropTypes';
+import {withNavigationPropTypes} from '../../../components/withNavigation';
+import * as App from '../../actions/App';
+import usePermissions from '../../../hooks/usePermissions';
+import CONST from '../../../CONST';
+import Navigation from '../Navigation';
+
+const propTypes = {
+    /** Available reports that would be displayed in this navigator */
+    reports: PropTypes.objectOf(reportPropTypes),
+
+    /** The policies which the user has access to */
+    policies: PropTypes.objectOf(
+        PropTypes.shape({
+            /** The policy name */
+            name: PropTypes.string,
+
+            /** The type of the policy */
+            type: PropTypes.string,
+        }),
+    ),
+
+    isFirstTimeNewExpensifyUser: PropTypes.bool,
+
+    /** Navigation route context info provided by react navigation */
+    route: PropTypes.shape({
+        /** Route specific parameters used on this screen */
+        params: PropTypes.shape({
+            /** If the admin room should be opened */
+            openOnAdminRoom: PropTypes.bool,
+
+            /** The ID of the report this screen should display */
+            reportID: PropTypes.string,
+        }),
+    }).isRequired,
+
+    ...withNavigationPropTypes,
+};
+
+const defaultProps = {
+    reports: {},
+    policies: {},
+    isFirstTimeNewExpensifyUser: false,
+};
+
+/**
+ * Get the most recently accessed report for the user
+ *
+ * @param {Object} reports
+ * @param {Boolean} ignoreDefaultRooms
+ * @param {Object} policies
+ * @param {Boolean} isFirstTimeNewExpensifyUser
+ * @param {Boolean} openOnAdminRoom
+ * @returns {Number}
+ */
+const getLastAccessedReportID = (reports, ignoreDefaultRooms, policies, isFirstTimeNewExpensifyUser, openOnAdminRoom) => {
+    // If deeplink url is of an attachment, we should show the report that the attachment comes from.
+    const currentRoute = Navigation.getActiveRoute();
+    const matches = CONST.REGEX.ATTACHMENT_ROUTE.exec(currentRoute);
+    const reportID = lodashGet(matches, 1, null);
+    if (reportID) {
+        return reportID;
+    }
+
+    const lastReport = ReportUtils.findLastAccessedReport(reports, ignoreDefaultRooms, policies, isFirstTimeNewExpensifyUser, openOnAdminRoom);
+
+    return lodashGet(lastReport, 'reportID');
+};
+
+// This wrapper is reponsible for opening the last accessed report if there is no reportID specified in the route params
+function ReportScreenIDSetter({route, reports, policies, isFirstTimeNewExpensifyUser, navigation}) {
+    const {canUseDefaultRooms} = usePermissions();
+
+    useEffect(() => {
+        // Don't update if there is a reportID in the params already
+        if (lodashGet(route, 'params.reportID', null)) {
+            App.confirmReadyToOpenApp();
+            return;
+        }
+
+        // If there is no reportID in route, try to find last accessed and use it for setParams
+        const reportID = getLastAccessedReportID(reports, !canUseDefaultRooms, policies, isFirstTimeNewExpensifyUser, lodashGet(route, 'params.openOnAdminRoom', false));
+
+        // It's possible that reports aren't fully loaded yet
+        // in that case the reportID is undefined
+        if (reportID) {
+            navigation.setParams({reportID: String(reportID)});
+        } else {
+            App.confirmReadyToOpenApp();
+        }
+    }, [route, navigation, reports, canUseDefaultRooms, policies, isFirstTimeNewExpensifyUser]);
+
+    // The ReportScreen without the reportID set will display a skeleton
+    // until the reportID is loaded and set in the route param
+    return null;
+}
+
+ReportScreenIDSetter.propTypes = propTypes;
+ReportScreenIDSetter.defaultProps = defaultProps;
+ReportScreenIDSetter.displayName = 'ReportScreenIDSetter';
+
+export default withOnyx({
+    reports: {
+        key: ONYXKEYS.COLLECTION.REPORT,
+        allowStaleData: true,
+    },
+    policies: {
+        key: ONYXKEYS.COLLECTION.POLICY,
+        allowStaleData: true,
+    },
+    isFirstTimeNewExpensifyUser: {
+        key: ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER,
+        initialValue: false,
+    },
+})(ReportScreenIDSetter);
diff --git a/src/libs/Navigation/AppNavigator/ReportScreenWrapper.js b/src/libs/Navigation/AppNavigator/ReportScreenWrapper.js
index f1743e1a2269..767bd9793ac2 100644
--- a/src/libs/Navigation/AppNavigator/ReportScreenWrapper.js
+++ b/src/libs/Navigation/AppNavigator/ReportScreenWrapper.js
@@ -1,36 +1,10 @@
-import React, {useEffect} from 'react';
 import PropTypes from 'prop-types';
-import lodashGet from 'lodash/get';
-import {withOnyx} from 'react-native-onyx';
-
-import ONYXKEYS from '../../../ONYXKEYS';
-
-import ReportScreen from '../../../pages/home/ReportScreen';
-import * as ReportUtils from '../../ReportUtils';
-import reportPropTypes from '../../../pages/reportPropTypes';
+import React from 'react';
 import {withNavigationPropTypes} from '../../../components/withNavigation';
-import * as App from '../../actions/App';
-import usePermissions from '../../../hooks/usePermissions';
-import CONST from '../../../CONST';
-import Navigation from '../Navigation';
+import ReportScreen from '../../../pages/home/ReportScreen';
+import ReportScreenIDSetter from './ReportScreenIDSetter';
 
 const propTypes = {
-    /** Available reports that would be displayed in this navigator */
-    reports: PropTypes.objectOf(reportPropTypes),
-
-    /** The policies which the user has access to */
-    policies: PropTypes.objectOf(
-        PropTypes.shape({
-            /** The policy name */
-            name: PropTypes.string,
-
-            /** The type of the policy */
-            type: PropTypes.string,
-        }),
-    ),
-
-    isFirstTimeNewExpensifyUser: PropTypes.bool,
-
     /** Navigation route context info provided by react navigation */
     route: PropTypes.shape({
         /** Route specific parameters used on this screen */
@@ -46,82 +20,24 @@ const propTypes = {
     ...withNavigationPropTypes,
 };
 
-const defaultProps = {
-    reports: {},
-    policies: {},
-    isFirstTimeNewExpensifyUser: false,
-};
-
-/**
- * Get the most recently accessed report for the user
- *
- * @param {Object} reports
- * @param {Boolean} [ignoreDefaultRooms]
- * @param {Object} policies
- * @param {Boolean} isFirstTimeNewExpensifyUser
- * @param {Boolean} openOnAdminRoom
- * @returns {Number}
- */
-const getLastAccessedReportID = (reports, ignoreDefaultRooms, policies, isFirstTimeNewExpensifyUser, openOnAdminRoom) => {
-    // If deeplink url is of an attachment, we should show the report that the attachment comes from.
-    const currentRoute = Navigation.getActiveRoute();
-    const matches = CONST.REGEX.ATTACHMENT_ROUTE.exec(currentRoute);
-    const reportID = lodashGet(matches, 1, null);
-    if (reportID) {
-        return reportID;
-    }
-
-    const lastReport = ReportUtils.findLastAccessedReport(reports, ignoreDefaultRooms, policies, isFirstTimeNewExpensifyUser, openOnAdminRoom);
-
-    return lodashGet(lastReport, 'reportID');
-};
+const defaultProps = {};
 
-// This wrapper is reponsible for opening the last accessed report if there is no reportID specified in the route params
 function ReportScreenWrapper(props) {
-    const {canUseDefaultRooms} = usePermissions();
-
-    useEffect(() => {
-        // Don't update if there is a reportID in the params already
-        if (lodashGet(props.route, 'params.reportID', null)) {
-            App.confirmReadyToOpenApp();
-            return;
-        }
-
-        // If there is no reportID in route, try to find last accessed and use it for setParams
-        const reportID = getLastAccessedReportID(
-            props.reports,
-            !canUseDefaultRooms,
-            props.policies,
-            props.isFirstTimeNewExpensifyUser,
-            lodashGet(props.route, 'params.openOnAdminRoom', false),
-        );
-
-        // It's possible that props.reports aren't fully loaded yet
-        // in that case the reportID is undefined
-        if (reportID) {
-            props.navigation.setParams({reportID: String(reportID)});
-        } else {
-            App.confirmReadyToOpenApp();
-        }
-    }, [props.route, props.navigation, props.reports, canUseDefaultRooms, props.policies, props.isFirstTimeNewExpensifyUser]);
-
     // The ReportScreen without the reportID set will display a skeleton
     // until the reportID is loaded and set in the route param
-    return <ReportScreen route={props.route} />;
+    return (
+        <>
+            <ReportScreen route={props.route} />
+            <ReportScreenIDSetter
+                route={props.route}
+                navigation={props.navigation}
+            />
+        </>
+    );
 }
 
 ReportScreenWrapper.propTypes = propTypes;
 ReportScreenWrapper.defaultProps = defaultProps;
 ReportScreenWrapper.displayName = 'ReportScreenWrapper';
 
-export default withOnyx({
-    reports: {
-        key: ONYXKEYS.COLLECTION.REPORT,
-    },
-    policies: {
-        key: ONYXKEYS.COLLECTION.POLICY,
-    },
-    isFirstTimeNewExpensifyUser: {
-        key: ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER,
-    },
-})(ReportScreenWrapper);
+export default ReportScreenWrapper;
diff --git a/src/libs/Navigation/Navigation.js b/src/libs/Navigation/Navigation.js
index b574b4ffa205..dc4f35a59cba 100644
--- a/src/libs/Navigation/Navigation.js
+++ b/src/libs/Navigation/Navigation.js
@@ -97,7 +97,7 @@ function navigate(route = ROUTES.HOME, type) {
  * @param {Bool} shouldEnforceFallback - Enforces navigation to fallback route
  * @param {Bool} shouldPopToTop - Should we navigate to LHN on back press
  */
-function goBack(fallbackRoute = ROUTES.HOME, shouldEnforceFallback = false, shouldPopToTop = false) {
+function goBack(fallbackRoute, shouldEnforceFallback = false, shouldPopToTop = false) {
     if (!canNavigate('goBack')) {
         return;
     }
@@ -165,7 +165,7 @@ function dismissModal(targetReportID) {
         case SCREENS.REPORT_ATTACHMENTS:
             // if we are not in the target report, we need to navigate to it after dismissing the modal
             if (targetReportID && targetReportID !== getTopmostReportId(rootState)) {
-                const state = getStateFromPath(ROUTES.getReportRoute(targetReportID));
+                const state = getStateFromPath(ROUTES.REPORT_WITH_ID.getRoute(targetReportID));
 
                 const action = getActionFromState(state, linkingConfig.config);
                 action.type = 'REPLACE';
diff --git a/src/libs/Navigation/NavigationRoot.js b/src/libs/Navigation/NavigationRoot.js
index 00c2d536e8ba..0dda39517d3c 100644
--- a/src/libs/Navigation/NavigationRoot.js
+++ b/src/libs/Navigation/NavigationRoot.js
@@ -86,7 +86,12 @@ function NavigationRoot(props) {
     const updateStatusBarBackgroundColor = (color) => StatusBar.setBackgroundColor(color);
     useAnimatedReaction(
         () => statusBarAnimation.value,
-        () => {
+        (current, previous) => {
+            // Do not run if either of the animated value is null
+            // or previous animated value is greater than or equal to the current one
+            if ([current, previous].includes(null) || current <= previous) {
+                return;
+            }
             const color = interpolateColor(statusBarAnimation.value, [0, 1], [prevStatusBarBackgroundColor.current, statusBarBackgroundColor.current]);
             runOnJS(updateStatusBarBackgroundColor)(color);
         },
@@ -98,7 +103,8 @@ function NavigationRoot(props) {
 
         prevStatusBarBackgroundColor.current = statusBarBackgroundColor.current;
         statusBarBackgroundColor.current = currentScreenBackgroundColor;
-        if (prevStatusBarBackgroundColor.current === statusBarBackgroundColor.current) {
+
+        if (currentScreenBackgroundColor === themeColors.appBG && prevStatusBarBackgroundColor.current === themeColors.appBG) {
             return;
         }
 
@@ -116,7 +122,10 @@ function NavigationRoot(props) {
         if (!state) {
             return;
         }
-        updateCurrentReportID(state);
+        // Performance optimization to avoid context consumers to delay first render
+        setTimeout(() => {
+            updateCurrentReportID(state);
+        }, 0);
         parseAndLogRoute(state);
         animateStatusBarBackgroundColor();
     };
diff --git a/src/libs/Navigation/OnyxTabNavigator.js b/src/libs/Navigation/OnyxTabNavigator.js
index d1717cc8a481..2782054497b0 100644
--- a/src/libs/Navigation/OnyxTabNavigator.js
+++ b/src/libs/Navigation/OnyxTabNavigator.js
@@ -33,6 +33,7 @@ function OnyxTabNavigator({id, selectedTab, children, ...rest}) {
             id={id}
             initialRouteName={selectedTab}
             backBehavior="initialRoute"
+            keyboardDismissMode="none"
             screenListeners={{
                 state: (event) => {
                     const state = event.data.state;
@@ -54,6 +55,6 @@ OnyxTabNavigator.displayName = 'OnyxTabNavigator';
 
 export default withOnyx({
     selectedTab: {
-        key: ({id}) => `${ONYXKEYS.SELECTED_TAB}_${id}`,
+        key: ({id}) => `${ONYXKEYS.COLLECTION.SELECTED_TAB}${id}`,
     },
 })(OnyxTabNavigator);
diff --git a/src/libs/Navigation/linkingConfig.js b/src/libs/Navigation/linkingConfig.js
index ee3054e02f96..bf069aba314e 100644
--- a/src/libs/Navigation/linkingConfig.js
+++ b/src/libs/Navigation/linkingConfig.js
@@ -16,11 +16,7 @@ export default {
             AppleSignInDesktop: ROUTES.APPLE_SIGN_IN,
             GoogleSignInDesktop: ROUTES.GOOGLE_SIGN_IN,
             [SCREENS.DESKTOP_SIGN_IN_REDIRECT]: ROUTES.DESKTOP_SIGN_IN_REDIRECT,
-            [SCREENS.REPORT_ATTACHMENTS]: ROUTES.REPORT_ATTACHMENTS,
-
-            // Demo routes
-            [CONST.DEMO_PAGES.SAASTR]: ROUTES.SAASTR,
-            [CONST.DEMO_PAGES.SBE]: ROUTES.SBE,
+            [SCREENS.REPORT_ATTACHMENTS]: ROUTES.REPORT_ATTACHMENTS.route,
 
             // Sidebar
             [SCREENS.HOME]: {
@@ -29,7 +25,7 @@ export default {
 
             [NAVIGATORS.CENTRAL_PANE_NAVIGATOR]: {
                 screens: {
-                    [SCREENS.REPORT]: ROUTES.REPORT_WITH_ID,
+                    [SCREENS.REPORT]: ROUTES.REPORT_WITH_ID.route,
                 },
             },
             [SCREENS.NOT_FOUND]: '*',
@@ -38,7 +34,7 @@ export default {
                 screens: {
                     Settings: {
                         screens: {
-                            Settings_Root: {
+                            [SCREENS.SETTINGS.ROOT]: {
                                 path: ROUTES.SETTINGS,
                             },
                             [SCREENS.SETTINGS.WORKSPACES]: {
@@ -65,7 +61,7 @@ export default {
                                 path: ROUTES.SETTINGS_CLOSE,
                                 exact: true,
                             },
-                            Settings_Security: {
+                            [SCREENS.SETTINGS.SECURITY]: {
                                 path: ROUTES.SETTINGS_SECURITY,
                                 exact: true,
                             },
@@ -73,6 +69,10 @@ export default {
                                 path: ROUTES.SETTINGS_WALLET,
                                 exact: true,
                             },
+                            Settings_Wallet_DomainCards: {
+                                path: ROUTES.SETTINGS_WALLET_DOMAINCARDS.route,
+                                exact: true,
+                            },
                             Settings_Wallet_EnablePayments: {
                                 path: ROUTES.SETTINGS_ENABLE_PAYMENTS,
                                 exact: true,
@@ -85,10 +85,6 @@ export default {
                                 path: ROUTES.SETTINGS_WALLET_CHOOSE_TRANSFER_ACCOUNT,
                                 exact: true,
                             },
-                            Settings_Add_Paypal_Me: {
-                                path: ROUTES.SETTINGS_ADD_PAYPAL_ME,
-                                exact: true,
-                            },
                             Settings_Add_Debit_Card: {
                                 path: ROUTES.SETTINGS_ADD_DEBIT_CARD,
                                 exact: true,
@@ -130,7 +126,7 @@ export default {
                                 exact: true,
                             },
                             Settings_ContactMethodDetails: {
-                                path: ROUTES.SETTINGS_CONTACT_METHOD_DETAILS,
+                                path: ROUTES.SETTINGS_CONTACT_METHOD_DETAILS.route,
                             },
                             Settings_Lounge_Access: {
                                 path: ROUTES.SETTINGS_LOUNGE_ACCESS,
@@ -155,6 +151,10 @@ export default {
                                 path: ROUTES.SETTINGS_PERSONAL_DETAILS_ADDRESS,
                                 exact: true,
                             },
+                            Settings_PersonalDetails_Address_Country: {
+                                path: ROUTES.SETTINGS_PERSONAL_DETAILS_ADDRESS_COUNTRY.route,
+                                exact: true,
+                            },
                             Settings_TwoFactorAuth: {
                                 path: ROUTES.SETTINGS_2FA,
                                 exact: true,
@@ -163,7 +163,7 @@ export default {
                                 path: ROUTES.SETTINGS_SHARE_CODE,
                                 exact: true,
                             },
-                            Settings_Status: {
+                            [SCREENS.SETTINGS.STATUS]: {
                                 path: ROUTES.SETTINGS_STATUS,
                                 exact: true,
                             },
@@ -172,90 +172,102 @@ export default {
                                 exact: true,
                             },
                             Workspace_Initial: {
-                                path: ROUTES.WORKSPACE_INITIAL,
+                                path: ROUTES.WORKSPACE_INITIAL.route,
                             },
                             Workspace_Settings: {
-                                path: ROUTES.WORKSPACE_SETTINGS,
+                                path: ROUTES.WORKSPACE_SETTINGS.route,
                             },
                             Workspace_Card: {
-                                path: ROUTES.WORKSPACE_CARD,
+                                path: ROUTES.WORKSPACE_CARD.route,
                             },
                             Workspace_Reimburse: {
-                                path: ROUTES.WORKSPACE_REIMBURSE,
+                                path: ROUTES.WORKSPACE_REIMBURSE.route,
                             },
                             Workspace_RateAndUnit: {
-                                path: ROUTES.WORKSPACE_RATE_AND_UNIT,
+                                path: ROUTES.WORKSPACE_RATE_AND_UNIT.route,
                             },
                             Workspace_Bills: {
-                                path: ROUTES.WORKSPACE_BILLS,
+                                path: ROUTES.WORKSPACE_BILLS.route,
                             },
                             Workspace_Invoices: {
-                                path: ROUTES.WORKSPACE_INVOICES,
+                                path: ROUTES.WORKSPACE_INVOICES.route,
                             },
                             Workspace_Travel: {
-                                path: ROUTES.WORKSPACE_TRAVEL,
+                                path: ROUTES.WORKSPACE_TRAVEL.route,
                             },
                             Workspace_Members: {
-                                path: ROUTES.WORKSPACE_MEMBERS,
+                                path: ROUTES.WORKSPACE_MEMBERS.route,
                             },
                             Workspace_Invite: {
-                                path: ROUTES.WORKSPACE_INVITE,
+                                path: ROUTES.WORKSPACE_INVITE.route,
                             },
                             Workspace_Invite_Message: {
-                                path: ROUTES.WORKSPACE_INVITE_MESSAGE,
-                            },
-                            Workspace_NewRoom: {
-                                path: ROUTES.WORKSPACE_NEW_ROOM,
+                                path: ROUTES.WORKSPACE_INVITE_MESSAGE.route,
                             },
                             ReimbursementAccount: {
-                                path: ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN,
+                                path: ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.route,
                                 exact: true,
                             },
                             GetAssistance: {
-                                path: ROUTES.GET_ASSISTANCE,
+                                path: ROUTES.GET_ASSISTANCE.route,
                             },
                         },
                     },
+                    Private_Notes: {
+                        screens: {
+                            PrivateNotes_View: ROUTES.PRIVATE_NOTES_VIEW.route,
+                            PrivateNotes_List: ROUTES.PRIVATE_NOTES_LIST.route,
+                            PrivateNotes_Edit: ROUTES.PRIVATE_NOTES_EDIT.route,
+                        },
+                    },
                     Report_Details: {
                         screens: {
-                            Report_Details_Root: ROUTES.REPORT_WITH_ID_DETAILS,
-                            Report_Details_Share_Code: ROUTES.REPORT_WITH_ID_DETAILS_SHARE_CODE,
+                            Report_Details_Root: ROUTES.REPORT_WITH_ID_DETAILS.route,
+                            Report_Details_Share_Code: ROUTES.REPORT_WITH_ID_DETAILS_SHARE_CODE.route,
                         },
                     },
                     Report_Settings: {
                         screens: {
                             Report_Settings_Root: {
-                                path: ROUTES.REPORT_SETTINGS,
+                                path: ROUTES.REPORT_SETTINGS.route,
                             },
                             Report_Settings_Room_Name: {
-                                path: ROUTES.REPORT_SETTINGS_ROOM_NAME,
+                                path: ROUTES.REPORT_SETTINGS_ROOM_NAME.route,
                             },
                             Report_Settings_Notification_Preferences: {
-                                path: ROUTES.REPORT_SETTINGS_NOTIFICATION_PREFERENCES,
+                                path: ROUTES.REPORT_SETTINGS_NOTIFICATION_PREFERENCES.route,
                             },
                             Report_Settings_Write_Capability: {
-                                path: ROUTES.REPORT_SETTINGS_WRITE_CAPABILITY,
+                                path: ROUTES.REPORT_SETTINGS_WRITE_CAPABILITY.route,
                             },
                         },
                     },
                     Report_WelcomeMessage: {
                         screens: {
-                            Report_WelcomeMessage_Root: ROUTES.REPORT_WELCOME_MESSAGE,
-                        },
-                    },
-                    NewGroup: {
-                        screens: {
-                            NewGroup_Root: ROUTES.NEW_GROUP,
+                            Report_WelcomeMessage_Root: ROUTES.REPORT_WELCOME_MESSAGE.route,
                         },
                     },
                     NewChat: {
                         screens: {
-                            NewChat_Root: ROUTES.NEW_CHAT,
+                            NewChat_Root: {
+                                path: ROUTES.NEW,
+                                exact: true,
+                                screens: {
+                                    chat: {
+                                        path: ROUTES.NEW_CHAT,
+                                        exact: true,
+                                    },
+                                    room: {
+                                        path: ROUTES.NEW_ROOM,
+                                        exact: true,
+                                    },
+                                },
+                            },
                         },
                     },
                     NewTask: {
                         screens: {
-                            NewTask_Root: ROUTES.NEW_TASK_WITH_REPORT_ID,
+                            NewTask_Root: ROUTES.NEW_TASK,
                             NewTask_TaskAssigneeSelector: ROUTES.NEW_TASK_ASSIGNEE,
                             NewTask_TaskShareDestinationSelector: ROUTES.NEW_TASK_SHARE_DESTINATION,
                             NewTask_Details: ROUTES.NEW_TASK_DETAILS,
@@ -265,7 +277,7 @@ export default {
                     },
                     TeachersUnite: {
                         screens: {
-                            SaveTheWorld_Root: ROUTES.SAVE_THE_WORLD,
+                            [SCREENS.SAVE_THE_WORLD.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,
@@ -278,23 +290,23 @@ export default {
                     },
                     Details: {
                         screens: {
-                            Details_Root: ROUTES.DETAILS,
+                            Details_Root: ROUTES.DETAILS.route,
                         },
                     },
                     Profile: {
                         screens: {
-                            Profile_Root: ROUTES.PROFILE,
+                            Profile_Root: ROUTES.PROFILE.route,
                         },
                     },
                     Participants: {
                         screens: {
-                            ReportParticipants_Root: ROUTES.REPORT_PARTICIPANTS,
+                            ReportParticipants_Root: ROUTES.REPORT_PARTICIPANTS.route,
                         },
                     },
                     MoneyRequest: {
                         screens: {
                             Money_Request: {
-                                path: ROUTES.MONEY_REQUEST,
+                                path: ROUTES.MONEY_REQUEST.route,
                                 exact: true,
                                 screens: {
                                     manual: {
@@ -306,20 +318,24 @@ export default {
                                         exact: true,
                                     },
                                     distance: {
-                                        path: ROUTES.MONEY_REQUEST_DISTANCE_TAB,
+                                        path: ROUTES.MONEY_REQUEST_DISTANCE_TAB.route,
                                         exact: true,
                                     },
                                 },
                             },
-                            Money_Request_Amount: ROUTES.MONEY_REQUEST_AMOUNT,
-                            Money_Request_Participants: ROUTES.MONEY_REQUEST_PARTICIPANTS,
-                            Money_Request_Confirmation: ROUTES.MONEY_REQUEST_CONFIRMATION,
-                            Money_Request_Date: ROUTES.MONEY_REQUEST_DATE,
-                            Money_Request_Currency: ROUTES.MONEY_REQUEST_CURRENCY,
-                            Money_Request_Description: ROUTES.MONEY_REQUEST_DESCRIPTION,
-                            Money_Request_Category: ROUTES.MONEY_REQUEST_CATEGORY,
-                            Money_Request_Merchant: ROUTES.MONEY_REQUEST_MERCHANT,
-                            Money_Request_Waypoint: ROUTES.MONEY_REQUEST_WAYPOINT,
+                            Money_Request_Amount: ROUTES.MONEY_REQUEST_AMOUNT.route,
+                            Money_Request_Participants: ROUTES.MONEY_REQUEST_PARTICIPANTS.route,
+                            Money_Request_Confirmation: ROUTES.MONEY_REQUEST_CONFIRMATION.route,
+                            Money_Request_Date: ROUTES.MONEY_REQUEST_DATE.route,
+                            Money_Request_Currency: ROUTES.MONEY_REQUEST_CURRENCY.route,
+                            Money_Request_Description: ROUTES.MONEY_REQUEST_DESCRIPTION.route,
+                            Money_Request_Category: ROUTES.MONEY_REQUEST_CATEGORY.route,
+                            Money_Request_Tag: ROUTES.MONEY_REQUEST_TAG.route,
+                            Money_Request_Merchant: ROUTES.MONEY_REQUEST_MERCHANT.route,
+                            Money_Request_Waypoint: ROUTES.MONEY_REQUEST_WAYPOINT.route,
+                            Money_Request_Edit_Waypoint: ROUTES.MONEY_REQUEST_EDIT_WAYPOINT.route,
+                            Money_Request_Receipt: ROUTES.MONEY_REQUEST_RECEIPT.route,
+                            Money_Request_Distance: ROUTES.MONEY_REQUEST_DISTANCE.route,
                             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,
@@ -327,14 +343,14 @@ export default {
                     },
                     SplitDetails: {
                         screens: {
-                            SplitDetails_Root: ROUTES.SPLIT_BILL_DETAILS,
+                            SplitDetails_Root: ROUTES.SPLIT_BILL_DETAILS.route,
                         },
                     },
                     Task_Details: {
                         screens: {
-                            Task_Title: ROUTES.TASK_TITLE,
-                            Task_Description: ROUTES.TASK_DESCRIPTION,
-                            Task_Assignee: ROUTES.TASK_ASSIGNEE,
+                            Task_Title: ROUTES.TASK_TITLE.route,
+                            Task_Description: ROUTES.TASK_DESCRIPTION.route,
+                            Task_Assignee: ROUTES.TASK_ASSIGNEE.route,
                         },
                     },
                     AddPersonalBankAccount: {
@@ -354,13 +370,13 @@ export default {
                     },
                     Flag_Comment: {
                         screens: {
-                            FlagComment_Root: ROUTES.FLAG_COMMENT,
+                            FlagComment_Root: ROUTES.FLAG_COMMENT.route,
                         },
                     },
                     EditRequest: {
                         screens: {
-                            EditRequest_Root: ROUTES.EDIT_REQUEST,
-                            EditRequest_Currency: ROUTES.EDIT_CURRENCY_REQUEST,
+                            EditRequest_Root: ROUTES.EDIT_REQUEST.route,
+                            EditRequest_Currency: ROUTES.EDIT_CURRENCY_REQUEST.route,
                         },
                     },
                     SignIn: {
diff --git a/src/libs/Notification/LocalNotification/BrowserNotifications.js b/src/libs/Notification/LocalNotification/BrowserNotifications.js
index e55c0430fe17..ca2cfc73866d 100644
--- a/src/libs/Notification/LocalNotification/BrowserNotifications.js
+++ b/src/libs/Notification/LocalNotification/BrowserNotifications.js
@@ -128,6 +128,16 @@ export default {
         });
     },
 
+    pushModifiedExpenseNotification({reportAction, onClick}, usesIcon = false) {
+        push({
+            title: _.map(reportAction.person, (f) => f.text).join(', '),
+            body: ReportUtils.getModifiedExpenseMessage(reportAction),
+            delay: 0,
+            onClick,
+            icon: usesIcon ? EXPENSIFY_ICON_URL : '',
+        });
+    },
+
     /**
      * Create a notification to indicate that an update is available.
      */
diff --git a/src/libs/Notification/LocalNotification/index.desktop.js b/src/libs/Notification/LocalNotification/index.desktop.js
index 2bef51cea0a6..a70141e7d9db 100644
--- a/src/libs/Notification/LocalNotification/index.desktop.js
+++ b/src/libs/Notification/LocalNotification/index.desktop.js
@@ -1,5 +1,11 @@
 import BrowserNotifications from './BrowserNotifications';
 
+/**
+ * @param {Object} options
+ * @param {Object} options.report
+ * @param {Object} options.reportAction
+ * @param {Function} options.onClick
+ */
 function showCommentNotification({report, reportAction, onClick}) {
     BrowserNotifications.pushReportCommentNotification({report, reportAction, onClick});
 }
@@ -8,7 +14,18 @@ function showUpdateAvailableNotification() {
     BrowserNotifications.pushUpdateAvailableNotification();
 }
 
+/**
+ * @param {Object} options
+ * @param {Object} options.report
+ * @param {Object} options.reportAction
+ * @param {Function} options.onClick
+ */
+function showModifiedExpenseNotification({report, reportAction, onClick}) {
+    BrowserNotifications.pushModifiedExpenseNotification({report, reportAction, onClick});
+}
+
 export default {
     showCommentNotification,
     showUpdateAvailableNotification,
+    showModifiedExpenseNotification,
 };
diff --git a/src/libs/Notification/LocalNotification/index.native.js b/src/libs/Notification/LocalNotification/index.native.js
index bbc4f48744b6..1f1771e619a5 100644
--- a/src/libs/Notification/LocalNotification/index.native.js
+++ b/src/libs/Notification/LocalNotification/index.native.js
@@ -2,4 +2,5 @@
 export default {
     showCommentNotification: () => {},
     showUpdateAvailableNotification: () => {},
+    showModifiedExpenseNotification: () => {},
 };
diff --git a/src/libs/Notification/LocalNotification/index.website.js b/src/libs/Notification/LocalNotification/index.website.js
index 3410b3144caf..0ecb8bcbb81d 100644
--- a/src/libs/Notification/LocalNotification/index.website.js
+++ b/src/libs/Notification/LocalNotification/index.website.js
@@ -1,5 +1,11 @@
 import BrowserNotifications from './BrowserNotifications';
 
+/**
+ * @param {Object} options
+ * @param {Object} options.report
+ * @param {Object} options.reportAction
+ * @param {Function} options.onClick
+ */
 function showCommentNotification({report, reportAction, onClick}) {
     BrowserNotifications.pushReportCommentNotification({report, reportAction, onClick}, true);
 }
@@ -8,7 +14,18 @@ function showUpdateAvailableNotification() {
     BrowserNotifications.pushUpdateAvailableNotification();
 }
 
+/**
+ * @param {Object} options
+ * @param {Object} options.report
+ * @param {Object} options.reportAction
+ * @param {Function} options.onClick
+ */
+function showModifiedExpenseNotification({report, reportAction, onClick}) {
+    BrowserNotifications.pushModifiedExpenseNotification({report, reportAction, onClick}, true);
+}
+
 export default {
     showCommentNotification,
     showUpdateAvailableNotification,
+    showModifiedExpenseNotification,
 };
diff --git a/src/libs/Notification/PushNotification/ForegroundNotifications/index.android.js b/src/libs/Notification/PushNotification/ForegroundNotifications/index.android.js
new file mode 100644
index 000000000000..0afc8fe10490
--- /dev/null
+++ b/src/libs/Notification/PushNotification/ForegroundNotifications/index.android.js
@@ -0,0 +1,15 @@
+import Airship from '@ua/react-native-airship';
+import shouldShowPushNotification from '../shouldShowPushNotification';
+
+function configureForegroundNotifications() {
+    Airship.push.android.setForegroundDisplayPredicate((pushPayload) => Promise.resolve(shouldShowPushNotification(pushPayload)));
+}
+
+function disableForegroundNotifications() {
+    Airship.push.android.setForegroundDisplayPredicate(() => Promise.resolve(false));
+}
+
+export default {
+    configureForegroundNotifications,
+    disableForegroundNotifications,
+};
diff --git a/src/libs/Notification/PushNotification/configureForegroundNotifications/index.ios.js b/src/libs/Notification/PushNotification/ForegroundNotifications/index.ios.js
similarity index 78%
rename from src/libs/Notification/PushNotification/configureForegroundNotifications/index.ios.js
rename to src/libs/Notification/PushNotification/ForegroundNotifications/index.ios.js
index 88d94b4ee805..17ad1baaebe3 100644
--- a/src/libs/Notification/PushNotification/configureForegroundNotifications/index.ios.js
+++ b/src/libs/Notification/PushNotification/ForegroundNotifications/index.ios.js
@@ -1,7 +1,7 @@
 import Airship, {iOS} from '@ua/react-native-airship';
 import shouldShowPushNotification from '../shouldShowPushNotification';
 
-export default function configureForegroundNotifications() {
+function configureForegroundNotifications() {
     // Set our default iOS foreground presentation to be loud with a banner
     // More info here https://developer.apple.com/documentation/usernotifications/unusernotificationcenterdelegate/1649518-usernotificationcenter
     Airship.push.iOS.setForegroundPresentationOptions([
@@ -15,3 +15,12 @@ export default function configureForegroundNotifications() {
     // Returning null keeps the default presentation. Returning [] uses no presentation (hides the notification).
     Airship.push.iOS.setForegroundPresentationOptionsCallback((pushPayload) => Promise.resolve(shouldShowPushNotification(pushPayload) ? null : []));
 }
+
+function disableForegroundNotifications() {
+    Airship.push.iOS.setForegroundPresentationOptionsCallback(() => Promise.resolve([]));
+}
+
+export default {
+    configureForegroundNotifications,
+    disableForegroundNotifications,
+};
diff --git a/src/libs/Notification/PushNotification/configureForegroundNotifications/index.js b/src/libs/Notification/PushNotification/ForegroundNotifications/index.js
similarity index 52%
rename from src/libs/Notification/PushNotification/configureForegroundNotifications/index.js
rename to src/libs/Notification/PushNotification/ForegroundNotifications/index.js
index c6cb13a0b3b9..acb116f7bc43 100644
--- a/src/libs/Notification/PushNotification/configureForegroundNotifications/index.js
+++ b/src/libs/Notification/PushNotification/ForegroundNotifications/index.js
@@ -1,4 +1,7 @@
 /**
  * Configures notification handling while in the foreground on iOS and Android. This is a no-op on other platforms.
  */
-export default function () {}
+export default {
+    configureForegroundNotifications: () => {},
+    disableForegroundNotifications: () => {},
+};
diff --git a/src/libs/Notification/PushNotification/configureForegroundNotifications/index.android.js b/src/libs/Notification/PushNotification/configureForegroundNotifications/index.android.js
deleted file mode 100644
index 393072df3d12..000000000000
--- a/src/libs/Notification/PushNotification/configureForegroundNotifications/index.android.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Airship from '@ua/react-native-airship';
-import shouldShowPushNotification from '../shouldShowPushNotification';
-
-export default function configureForegroundNotifications() {
-    Airship.push.android.setForegroundDisplayPredicate((pushPayload) => Promise.resolve(shouldShowPushNotification(pushPayload)));
-}
diff --git a/src/libs/Notification/PushNotification/index.native.js b/src/libs/Notification/PushNotification/index.native.js
index 299af69873f9..7192ee66a791 100644
--- a/src/libs/Notification/PushNotification/index.native.js
+++ b/src/libs/Notification/PushNotification/index.native.js
@@ -6,7 +6,7 @@ import Log from '../../Log';
 import NotificationType from './NotificationType';
 import * as PushNotification from '../../actions/PushNotification';
 import ONYXKEYS from '../../../ONYXKEYS';
-import configureForegroundNotifications from './configureForegroundNotifications';
+import ForegroundNotifications from './ForegroundNotifications';
 
 let isUserOptedInToPushNotifications = false;
 Onyx.connect({
@@ -96,7 +96,7 @@ function init() {
     // Keep track of which users have enabled push notifications via an NVP.
     Airship.addListener(EventType.NotificationOptInStatus, refreshNotificationOptInStatus);
 
-    configureForegroundNotifications();
+    ForegroundNotifications.configureForegroundNotifications();
 }
 
 /**
@@ -136,6 +136,7 @@ function deregister() {
     Airship.contact.reset();
     Airship.removeAllListeners(EventType.PushReceived);
     Airship.removeAllListeners(EventType.NotificationResponse);
+    ForegroundNotifications.disableForegroundNotifications();
 }
 
 /**
diff --git a/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.js b/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.js
index a36fef610a39..aadc7d6c3983 100644
--- a/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.js
+++ b/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.js
@@ -27,11 +27,11 @@ export default function subscribeToReportCommentPushNotifications() {
             try {
                 // If a chat is visible other than the one we are trying to navigate to, then we need to navigate back
                 if (Navigation.getActiveRoute().slice(1, 2) === ROUTES.REPORT && !Navigation.isActiveRoute(`r/${reportID}`)) {
-                    Navigation.goBack();
+                    Navigation.goBack(ROUTES.HOME);
                 }
 
                 Log.info('[PushNotification] onSelected() - Navigation is ready. Navigating...', false, {reportID, reportActionID});
-                Navigation.navigate(ROUTES.getReportRoute(reportID));
+                Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
             } catch (error) {
                 Log.alert('[PushNotification] onSelected() - failed', {reportID, reportActionID, error: error.message});
             }
diff --git a/src/libs/NumberUtils.js b/src/libs/NumberUtils.ts
similarity index 80%
rename from src/libs/NumberUtils.js
rename to src/libs/NumberUtils.ts
index ee0b8a8fa397..0d2b4135c5b6 100644
--- a/src/libs/NumberUtils.js
+++ b/src/libs/NumberUtils.ts
@@ -1,11 +1,11 @@
-import _ from 'underscore';
 import CONST from '../CONST';
 
 /**
  * Generates a random positive 64 bit numeric string by randomly generating the left, middle, and right parts and concatenating them. Used to generate client-side ids.
- * @returns {String} string representation of a randomly generated 64 bit signed integer
+ *
+ * @returns string representation of a randomly generated 64 bit signed integer
  */
-function rand64() {
+function rand64(): string {
     // Max 64-bit signed:
     // 9,223,372,036,854,775,807
     // The left part of the max 64-bit number *+1* because we're flooring it.
@@ -38,24 +38,22 @@ function rand64() {
 
 /**
  * Returns a hexadecimal value of the specified length
- * @param {Number} num
- * @returns {String}
  */
-function generateHexadecimalValue(num) {
-    return _.times(num, () => Math.floor(Math.random() * 16).toString(16))
-        .join('')
-        .toUpperCase();
+function generateHexadecimalValue(num: number): string {
+    const result: string[] = [];
+    for (let i = 0; i < num; i++) {
+        result.push(Math.floor(Math.random() * 16).toString(16));
+    }
+    return result.join('').toUpperCase();
 }
 
 /**
  * Generates a random integer between a and b
  * It's and equivalent of _.random(a, b)
  *
- * @param {Number} a
- * @param {Number} b
- * @returns {Number} random integer between a and b
+ * @returns random integer between a and b
  */
-function generateRandomInt(a, b) {
+function generateRandomInt(a: number, b: number): number {
     const lower = Math.ceil(Math.min(a, b));
     const upper = Math.floor(Math.max(a, b));
     return Math.floor(lower + Math.random() * (upper - lower + 1));
diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index d26ad48430b0..e0f334ca36af 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -92,31 +92,30 @@ Onyx.connect({
 });
 
 /**
- * Get the options for a policy expense report.
+ * Get the option for a policy expense report.
  * @param {Object} report
- * @returns {Array}
+ * @returns {Object}
  */
-function getPolicyExpenseReportOptions(report) {
+function getPolicyExpenseReportOption(report) {
     const expenseReport = policyExpenseReports[`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`];
     const policyExpenseChatAvatarSource = ReportUtils.getWorkspaceAvatar(expenseReport);
     const reportName = ReportUtils.getReportName(expenseReport);
-    return [
-        {
-            ...expenseReport,
-            keyForList: expenseReport.policyID,
-            text: reportName,
-            alternateText: Localize.translateLocal('workspace.common.workspace'),
-            icons: [
-                {
-                    source: policyExpenseChatAvatarSource,
-                    name: reportName,
-                    type: CONST.ICON_TYPE_WORKSPACE,
-                },
-            ],
-            selected: report.selected,
-            isPolicyExpenseChat: true,
-        },
-    ];
+    return {
+        ...expenseReport,
+        keyForList: expenseReport.policyID,
+        text: reportName,
+        alternateText: Localize.translateLocal('workspace.common.workspace'),
+        icons: [
+            {
+                source: policyExpenseChatAvatarSource,
+                name: reportName,
+                type: CONST.ICON_TYPE_WORKSPACE,
+            },
+        ],
+        selected: report.selected,
+        isPolicyExpenseChat: true,
+        searchText: report.searchText,
+    };
 }
 
 /**
@@ -201,38 +200,35 @@ function isPersonalDetailsReady(personalDetails) {
 }
 
 /**
- * Get the participant options for a report.
- * @param {Array<Object>} participants
+ * Get the participant option for a report.
+ * @param {Object} participant
  * @param {Array<Object>} personalDetails
- * @returns {Array}
+ * @returns {Object}
  */
-function getParticipantsOptions(participants, personalDetails) {
-    const details = getPersonalDetailsForAccountIDs(_.pluck(participants, 'accountID'), personalDetails);
-    return _.map(participants, (participant) => {
-        const detail = details[participant.accountID];
-        const login = detail.login || participant.login;
-        const displayName = detail.displayName || LocalePhoneNumber.formatPhoneNumber(login);
-        return {
-            keyForList: String(detail.accountID),
-            login,
-            accountID: detail.accountID,
-            text: displayName,
-            firstName: lodashGet(detail, 'firstName', ''),
-            lastName: lodashGet(detail, 'lastName', ''),
-            alternateText: LocalePhoneNumber.formatPhoneNumber(login) || displayName,
-            icons: [
-                {
-                    source: UserUtils.getAvatar(detail.avatar, detail.accountID),
-                    name: login,
-                    type: CONST.ICON_TYPE_AVATAR,
-                    id: detail.accountID,
-                },
-            ],
-            payPalMeAddress: lodashGet(detail, 'payPalMeAddress', ''),
-            phoneNumber: lodashGet(detail, 'phoneNumber', ''),
-            selected: participant.selected,
-        };
-    });
+function getParticipantsOption(participant, personalDetails) {
+    const detail = getPersonalDetailsForAccountIDs([participant.accountID], personalDetails)[participant.accountID];
+    const login = detail.login || participant.login;
+    const displayName = detail.displayName || LocalePhoneNumber.formatPhoneNumber(login);
+    return {
+        keyForList: String(detail.accountID),
+        login,
+        accountID: detail.accountID,
+        text: displayName,
+        firstName: lodashGet(detail, 'firstName', ''),
+        lastName: lodashGet(detail, 'lastName', ''),
+        alternateText: LocalePhoneNumber.formatPhoneNumber(login) || displayName,
+        icons: [
+            {
+                source: UserUtils.getAvatar(detail.avatar, detail.accountID),
+                name: login,
+                type: CONST.ICON_TYPE_AVATAR,
+                id: detail.accountID,
+            },
+        ],
+        phoneNumber: lodashGet(detail, 'phoneNumber', ''),
+        selected: participant.selected,
+        searchText: participant.searchText,
+    };
 }
 
 /**
@@ -399,7 +395,8 @@ function getLastMessageTextForReport(report) {
         const iouReport = ReportUtils.getReport(ReportActionUtils.getIOUReportIDFromReportActionPreview(lastReportAction));
         lastMessageTextFromReport = ReportUtils.getReportPreviewMessage(iouReport, lastReportAction);
     } else if (ReportActionUtils.isModifiedExpenseAction(lastReportAction)) {
-        lastMessageTextFromReport = ReportUtils.getModifiedExpenseMessage(lastReportAction);
+        const properSchemaForModifiedExpenseMessage = ReportUtils.getModifiedExpenseMessage(lastReportAction);
+        lastMessageTextFromReport = ReportUtils.formatReportLastMessageText(properSchemaForModifiedExpenseMessage, true);
     } else {
         lastMessageTextFromReport = report ? report.lastMessageText || '' : '';
 
@@ -446,7 +443,6 @@ function createOption(accountIDs, personalDetails, report, reportActions = {}, {
         login: null,
         reportID: null,
         phoneNumber: null,
-        payPalMeAddress: null,
         hasDraftComment: false,
         keyForList: null,
         searchText: null,
@@ -540,12 +536,11 @@ function createOption(accountIDs, personalDetails, report, reportActions = {}, {
         result.login = personalDetail.login;
         result.accountID = Number(personalDetail.accountID);
         result.phoneNumber = personalDetail.phoneNumber;
-        result.payPalMeAddress = personalDetail.payPalMeAddress;
     }
 
     result.text = reportName;
     result.searchText = getSearchText(report, reportName, personalDetailList, result.isChatRoom || result.isPolicyExpenseChat, result.isThread);
-    result.icons = ReportUtils.getIcons(report, personalDetails, UserUtils.getAvatar(personalDetail.avatar, personalDetail.accountID), false, personalDetail.login, personalDetail.accountID);
+    result.icons = ReportUtils.getIcons(report, personalDetails, UserUtils.getAvatar(personalDetail.avatar, personalDetail.accountID), personalDetail.login, personalDetail.accountID);
     result.subtitle = subtitle;
 
     return result;
@@ -600,11 +595,35 @@ function isCurrentUser(userDetails) {
 }
 
 /**
- * Build the options for the category tree hierarchy via indents
+ * Calculates count of all enabled options
+ *
+ * @param {Object[]} options - an initial strings array
+ * @param {Boolean} options[].enabled - a flag to enable/disable option in a list
+ * @param {String} options[].name - a name of an option
+ * @returns {Number}
+ */
+function getEnabledCategoriesCount(options) {
+    return _.filter(options, (option) => option.enabled).length;
+}
+
+/**
+ * Verifies that there is at least one enabled option
  *
  * @param {Object[]} options - an initial strings array
  * @param {Boolean} options[].enabled - a flag to enable/disable option in a list
  * @param {String} options[].name - a name of an option
+ * @returns {Boolean}
+ */
+function hasEnabledOptions(options) {
+    return _.some(options, (option) => option.enabled);
+}
+
+/**
+ * Build the options for the category tree hierarchy via indents
+ *
+ * @param {Object[]} options - an initial object array
+ * @param {Boolean} options[].enabled - a flag to enable/disable option in a list
+ * @param {String} options[].name - a name of an option
  * @param {Boolean} [isOneLine] - a flag to determine if text should be one line
  * @returns {Array<Object>}
  */
@@ -612,6 +631,10 @@ function getCategoryOptionTree(options, isOneLine = false) {
     const optionCollection = {};
 
     _.each(options, (option) => {
+        if (!option.enabled) {
+            return;
+        }
+
         if (isOneLine) {
             if (_.has(optionCollection, option.name)) {
                 return;
@@ -652,12 +675,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 +685,28 @@ function getCategoryOptionTree(options, isOneLine = false) {
  */
 function getCategoryListSections(categories, recentlyUsedCategories, selectedOptions, searchInputValue, maxRecentReportsToShow) {
     const categorySections = [];
-    const numberOfCategories = _.size(categories);
+    const categoriesValues = _.chain(categories)
+        .values()
+        .filter((category) => category.enabled)
+        .value();
+
+    const numberOfCategories = _.size(categoriesValues);
     let indexOffset = 0;
 
+    if (numberOfCategories === 0 && selectedOptions.length > 0) {
+        categorySections.push({
+            // "Selected" section
+            title: '',
+            shouldShow: false,
+            indexOffset,
+            data: getCategoryOptionTree(selectedOptions, true),
+        });
+
+        return categorySections;
+    }
+
     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 +725,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({
@@ -736,6 +778,142 @@ function getCategoryListSections(categories, recentlyUsedCategories, selectedOpt
     return categorySections;
 }
 
+/**
+ * Transforms the provided tags into objects with a specific structure.
+ *
+ * @param {Object[]} tags - an initial tag array
+ * @param {Boolean} tags[].enabled - a flag to enable/disable option in a list
+ * @param {String} tags[].name - a name of an option
+ * @returns {Array<Object>}
+ */
+function getTagsOptions(tags) {
+    return _.map(tags, (tag) => ({
+        text: tag.name,
+        keyForList: tag.name,
+        searchText: tag.name,
+        tooltipText: tag.name,
+        isDisabled: !tag.enabled,
+    }));
+}
+
+/**
+ * Build the section list for tags
+ *
+ * @param {Object[]} tags
+ * @param {String} tags[].name
+ * @param {Boolean} tags[].enabled
+ * @param {String[]} recentlyUsedTags
+ * @param {Object[]} selectedOptions
+ * @param {String} selectedOptions[].name
+ * @param {String} searchInputValue
+ * @param {Number} maxRecentReportsToShow
+ * @returns {Array<Object>}
+ */
+function getTagListSections(tags, recentlyUsedTags, selectedOptions, searchInputValue, maxRecentReportsToShow) {
+    const tagSections = [];
+    const enabledTags = _.filter(tags, (tag) => tag.enabled);
+    const numberOfTags = _.size(enabledTags);
+    let indexOffset = 0;
+
+    // If all tags are disabled but there's a previously selected tag, show only the selected tag
+    if (numberOfTags === 0 && selectedOptions.length > 0) {
+        const selectedTagOptions = _.map(selectedOptions, (option) => ({
+            name: option.name,
+            // Should be marked as enabled to be able to be de-selected
+            enabled: true,
+        }));
+        tagSections.push({
+            // "Selected" section
+            title: '',
+            shouldShow: false,
+            indexOffset,
+            data: getTagsOptions(selectedTagOptions),
+        });
+
+        return tagSections;
+    }
+
+    if (!_.isEmpty(searchInputValue)) {
+        const searchTags = _.filter(enabledTags, (tag) => tag.name.toLowerCase().includes(searchInputValue.toLowerCase()));
+
+        tagSections.push({
+            // "Search" section
+            title: '',
+            shouldShow: false,
+            indexOffset,
+            data: getTagsOptions(searchTags),
+        });
+
+        return tagSections;
+    }
+
+    if (numberOfTags < CONST.TAG_LIST_THRESHOLD) {
+        tagSections.push({
+            // "All" section when items amount less than the threshold
+            title: '',
+            shouldShow: false,
+            indexOffset,
+            data: getTagsOptions(enabledTags),
+        });
+
+        return tagSections;
+    }
+
+    const selectedOptionNames = _.map(selectedOptions, (selectedOption) => selectedOption.name);
+    const filteredRecentlyUsedTags = _.map(
+        _.filter(recentlyUsedTags, (recentlyUsedTag) => {
+            const tagObject = _.find(tags, (tag) => tag.name === recentlyUsedTag);
+            return Boolean(tagObject && tagObject.enabled) && !_.includes(selectedOptionNames, recentlyUsedTag);
+        }),
+        (tag) => ({name: tag, enabled: true}),
+    );
+    const filteredTags = _.filter(enabledTags, (tag) => !_.includes(selectedOptionNames, tag.name));
+
+    if (!_.isEmpty(selectedOptions)) {
+        const selectedTagOptions = _.map(selectedOptions, (option) => {
+            const tagObject = _.find(tags, (tag) => tag.name === option.name);
+            return {
+                name: option.name,
+                enabled: Boolean(tagObject && tagObject.enabled),
+            };
+        });
+
+        tagSections.push({
+            // "Selected" section
+            title: '',
+            shouldShow: false,
+            indexOffset,
+            data: getTagsOptions(selectedTagOptions),
+        });
+
+        indexOffset += selectedOptions.length;
+    }
+
+    if (!_.isEmpty(filteredRecentlyUsedTags)) {
+        const cutRecentlyUsedTags = filteredRecentlyUsedTags.slice(0, maxRecentReportsToShow);
+
+        tagSections.push({
+            // "Recent" section
+            title: Localize.translateLocal('common.recent'),
+            shouldShow: true,
+            indexOffset,
+            data: getTagsOptions(cutRecentlyUsedTags),
+        });
+
+        indexOffset += filteredRecentlyUsedTags.length;
+    }
+
+    tagSections.push({
+        // "All" section when items amount more than the threshold
+        title: Localize.translateLocal('common.all'),
+        shouldShow: true,
+        indexOffset,
+        data: getTagsOptions(filteredTags),
+    });
+
+    return tagSections;
+}
+
 /**
  * Build the options
  *
@@ -772,11 +950,14 @@ function getOptions(
         includeCategories = false,
         categories = {},
         recentlyUsedCategories = [],
+        includeTags = false,
+        tags = {},
+        recentlyUsedTags = [],
         canInviteUser = true,
     },
 ) {
     if (includeCategories) {
-        const categoryOptions = getCategoryListSections(_.values(categories), recentlyUsedCategories, selectedOptions, searchInputValue, maxRecentReportsToShow);
+        const categoryOptions = getCategoryListSections(categories, recentlyUsedCategories, selectedOptions, searchInputValue, maxRecentReportsToShow);
 
         return {
             recentReports: [],
@@ -784,6 +965,20 @@ function getOptions(
             userToInvite: null,
             currentUserOption: null,
             categoryOptions,
+            tagOptions: [],
+        };
+    }
+
+    if (includeTags) {
+        const tagOptions = getTagListSections(_.values(tags), recentlyUsedTags, selectedOptions, searchInputValue, maxRecentReportsToShow);
+
+        return {
+            recentReports: [],
+            personalDetails: [],
+            userToInvite: null,
+            currentUserOption: null,
+            categoryOptions: [],
+            tagOptions,
         };
     }
 
@@ -794,6 +989,7 @@ function getOptions(
             userToInvite: null,
             currentUserOption: null,
             categoryOptions: [],
+            tagOptions: [],
         };
     }
 
@@ -895,10 +1091,10 @@ function getOptions(
     }
 
     // Always exclude already selected options and the currently logged in user
-    const loginOptionsToExclude = [...selectedOptions, {login: currentUserLogin}];
+    const optionsToExclude = [...selectedOptions, {login: currentUserLogin}];
 
     _.each(excludeLogins, (login) => {
-        loginOptionsToExclude.push({login});
+        optionsToExclude.push({login});
     });
 
     if (includeRecentReports) {
@@ -919,7 +1115,11 @@ function getOptions(
             }
 
             // If we're excluding threads, check the report to see if it has a single participant and if the participant is already selected
-            if (!includeThreads && reportOption.login && _.some(loginOptionsToExclude, (option) => option.login === reportOption.login)) {
+            if (
+                !includeThreads &&
+                (reportOption.login || reportOption.reportID) &&
+                _.some(optionsToExclude, (option) => (option.login && option.login === reportOption.login) || (option.reportID && option.reportID === reportOption.reportID))
+            ) {
                 continue;
             }
 
@@ -943,7 +1143,7 @@ function getOptions(
 
             // Add this login to the exclude list so it won't appear when we process the personal details
             if (reportOption.login) {
-                loginOptionsToExclude.push({login: reportOption.login});
+                optionsToExclude.push({login: reportOption.login});
             }
         }
     }
@@ -951,7 +1151,7 @@ function getOptions(
     if (includePersonalDetails) {
         // Next loop over all personal details removing any that are selectedUsers or recentChats
         _.each(allPersonalDetailsOptions, (personalDetailOption) => {
-            if (_.some(loginOptionsToExclude, (loginOptionToExclude) => loginOptionToExclude.login === personalDetailOption.login)) {
+            if (_.some(optionsToExclude, (optionToExclude) => optionToExclude.login === personalDetailOption.login)) {
                 return;
             }
             const {searchText, participantsList, isChatRoom} = personalDetailOption;
@@ -979,7 +1179,7 @@ function getOptions(
         _.every(selectedOptions, (option) => option.login !== searchValue) &&
         ((Str.isValidEmail(searchValue) && !Str.isDomainEmail(searchValue) && !Str.endsWith(searchValue, CONST.SMS.DOMAIN)) ||
             (parsedPhoneNumber.possible && Str.isValidPhone(LoginUtils.getPhoneNumberWithoutSpecialChars(parsedPhoneNumber.number.input)))) &&
-        !_.find(loginOptionsToExclude, (loginOptionToExclude) => loginOptionToExclude.login === addSMSDomainIfPhoneNumber(searchValue).toLowerCase()) &&
+        !_.find(optionsToExclude, (optionToExclude) => optionToExclude.login === addSMSDomainIfPhoneNumber(searchValue).toLowerCase()) &&
         (searchValue !== CONST.EMAIL.CHRONOS || Permissions.canUseChronos(betas)) &&
         !excludeUnknownUsers
     ) {
@@ -1044,6 +1244,7 @@ function getOptions(
         userToInvite: canInviteUser ? userToInvite : null,
         currentUserOption,
         categoryOptions: [],
+        tagOptions: [],
     };
 }
 
@@ -1127,11 +1328,14 @@ function getIOUConfirmationOptionsFromParticipants(participants, amountText) {
  * @param {boolean} [includeP2P]
  * @param {boolean} [includeCategories]
  * @param {Object} [categories]
- * @param {Array<Object>} [recentlyUsedCategories]
+ * @param {Array<String>} [recentlyUsedCategories]
+ * @param {boolean} [includeTags]
+ * @param {Object} [tags]
+ * @param {Array<String>} [recentlyUsedTags]
  * @param {boolean} [canInviteUser]
  * @returns {Object}
  */
-function getNewChatOptions(
+function getFilteredOptions(
     reports,
     personalDetails,
     betas = [],
@@ -1143,6 +1347,9 @@ function getNewChatOptions(
     includeCategories = false,
     categories = {},
     recentlyUsedCategories = [],
+    includeTags = false,
+    tags = {},
+    recentlyUsedTags = [],
     canInviteUser = true,
 ) {
     return getOptions(reports, personalDetails, {
@@ -1158,6 +1365,9 @@ function getNewChatOptions(
         includeCategories,
         categories,
         recentlyUsedCategories,
+        includeTags,
+        tags,
+        recentlyUsedTags,
         canInviteUser,
     });
 }
@@ -1313,7 +1523,7 @@ export {
     isCurrentUser,
     isPersonalDetailsReady,
     getSearchOptions,
-    getNewChatOptions,
+    getFilteredOptions,
     getShareDestinationOptions,
     getMemberInviteOptions,
     getHeaderMessage,
@@ -1322,11 +1532,13 @@ export {
     getIOUConfirmationOptionsFromParticipants,
     getSearchText,
     getAllReportErrors,
-    getPolicyExpenseReportOptions,
-    getParticipantsOptions,
+    getPolicyExpenseReportOption,
+    getParticipantsOption,
     isSearchStringMatch,
     shouldOptionShowTooltip,
     getLastMessageTextForReport,
+    getEnabledCategoriesCount,
+    hasEnabledOptions,
     getCategoryOptionTree,
     formatMemberForList,
 };
diff --git a/src/libs/PaymentUtils.js b/src/libs/PaymentUtils.js
index c211f9538960..67d7c74869fc 100644
--- a/src/libs/PaymentUtils.js
+++ b/src/libs/PaymentUtils.js
@@ -1,7 +1,6 @@
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import BankAccount from './models/BankAccount';
-import * as Expensicons from '../components/Icon/Expensicons';
 import getBankIcon from '../components/Icon/BankIcons';
 import CONST from '../CONST';
 import * as Localize from './Localize';
@@ -26,14 +25,11 @@ function hasExpensifyPaymentMethod(fundList = [], bankAccountList = []) {
 }
 
 /**
- * @param {String} [accountType] - one of {'bankAccount', 'debitCard', 'payPalMe'}
+ * @param {String} [accountType] - one of {'bankAccount', 'debitCard'}
  * @param {Object} account
  * @returns {String}
  */
 function getPaymentMethodDescription(accountType, account) {
-    if (accountType === CONST.PAYMENT_METHODS.PAYPAL) {
-        return account.username;
-    }
     if (accountType === CONST.PAYMENT_METHODS.BANK_ACCOUNT) {
         return `${Localize.translateLocal('paymentMethodList.accountLastFour')} ${account.accountNumber.slice(-4)}`;
     }
@@ -47,10 +43,9 @@ function getPaymentMethodDescription(accountType, account) {
  * Get the PaymentMethods list
  * @param {Array} bankAccountList
  * @param {Array} fundList
- * @param {Object} [payPalMeData = null]
  * @returns {Array<PaymentMethod>}
  */
-function formatPaymentMethods(bankAccountList, fundList, payPalMeData = null) {
+function formatPaymentMethods(bankAccountList, fundList) {
     const combinedPaymentMethods = [];
 
     _.each(bankAccountList, (bankAccount) => {
@@ -82,14 +77,6 @@ function formatPaymentMethods(bankAccountList, fundList, payPalMeData = null) {
         });
     });
 
-    if (!_.isEmpty(payPalMeData)) {
-        combinedPaymentMethods.push({
-            ...payPalMeData,
-            description: getPaymentMethodDescription(payPalMeData.accountType, payPalMeData.accountData),
-            icon: Expensicons.PayPal,
-        });
-    }
-
     return combinedPaymentMethods;
 }
 
diff --git a/src/libs/Permissions.js b/src/libs/Permissions.js
deleted file mode 100644
index f37cd5bb5bf3..000000000000
--- a/src/libs/Permissions.js
+++ /dev/null
@@ -1,108 +0,0 @@
-import _ from 'underscore';
-import CONST from '../CONST';
-
-/**
- * @private
- * @param {Array<String>} betas
- * @returns {Boolean}
- */
-function canUseAllBetas(betas) {
-    return _.contains(betas, CONST.BETAS.ALL);
-}
-
-/**
- * @param {Array<String>} betas
- * @returns {Boolean}
- */
-function canUseChronos(betas) {
-    return _.contains(betas, CONST.BETAS.CHRONOS_IN_CASH) || canUseAllBetas(betas);
-}
-
-/**
- * @param {Array<String>} betas
- * @returns {Boolean}
- */
-function canUsePayWithExpensify(betas) {
-    return _.contains(betas, CONST.BETAS.PAY_WITH_EXPENSIFY) || canUseAllBetas(betas);
-}
-
-/**
- * @param {Array<String>} betas
- * @returns {Boolean}
- */
-function canUseDefaultRooms(betas) {
-    return _.contains(betas, CONST.BETAS.DEFAULT_ROOMS) || canUseAllBetas(betas);
-}
-
-/**
- * IOU Send feature is temporarily disabled.
- *
- * @returns {Boolean}
- */
-function canUseIOUSend() {
-    return false;
-}
-
-/**
- * @param {Array<String>} betas
- * @returns {Boolean}
- */
-function canUseWallet(betas) {
-    return _.contains(betas, CONST.BETAS.BETA_EXPENSIFY_WALLET) || canUseAllBetas(betas);
-}
-
-/**
- * @param {Array<String>} betas
- * @returns {Boolean}
- */
-function canUseCommentLinking(betas) {
-    return _.contains(betas, CONST.BETAS.BETA_COMMENT_LINKING) || canUseAllBetas(betas);
-}
-
-/**
- * We're requiring you to be added to the policy rooms beta on dev,
- * since contributors have been reporting a number of false issues related to the feature being under development.
- * See https://expensify.slack.com/archives/C01GTK53T8Q/p1641921996319400?thread_ts=1641598356.166900&cid=C01GTK53T8Q
- * @param {Array<String>} betas
- * @returns {Boolean}
- */
-function canUsePolicyRooms(betas) {
-    return _.contains(betas, CONST.BETAS.POLICY_ROOMS) || canUseAllBetas(betas);
-}
-
-/**
- * @param {Array<String>} betas
- * @returns {Boolean}
- */
-function canUseTasks(betas) {
-    return _.contains(betas, CONST.BETAS.TASKS) || canUseAllBetas(betas);
-}
-
-/**
- * @param {Array<String>} betas
- * @returns {Boolean}
- */
-function canUseCustomStatus(betas) {
-    return _.contains(betas, CONST.BETAS.CUSTOM_STATUS) || canUseAllBetas(betas);
-}
-
-/**
- * Link previews are temporarily disabled.
- * @returns {Boolean}
- */
-function canUseLinkPreviews() {
-    return false;
-}
-
-export default {
-    canUseChronos,
-    canUsePayWithExpensify,
-    canUseDefaultRooms,
-    canUseIOUSend,
-    canUseWallet,
-    canUseCommentLinking,
-    canUsePolicyRooms,
-    canUseTasks,
-    canUseCustomStatus,
-    canUseLinkPreviews,
-};
diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
new file mode 100644
index 000000000000..05322472a407
--- /dev/null
+++ b/src/libs/Permissions.ts
@@ -0,0 +1,80 @@
+import CONST from '../CONST';
+import Beta from '../types/onyx/Beta';
+
+function canUseAllBetas(betas: Beta[]): boolean {
+    return betas?.includes(CONST.BETAS.ALL);
+}
+
+function canUseChronos(betas: Beta[]): boolean {
+    return betas?.includes(CONST.BETAS.CHRONOS_IN_CASH) || canUseAllBetas(betas);
+}
+
+function canUsePayWithExpensify(betas: Beta[]): boolean {
+    return betas?.includes(CONST.BETAS.PAY_WITH_EXPENSIFY) || canUseAllBetas(betas);
+}
+
+function canUseDefaultRooms(betas: Beta[]): boolean {
+    return betas?.includes(CONST.BETAS.DEFAULT_ROOMS) || canUseAllBetas(betas);
+}
+
+/**
+ * IOU Send feature is temporarily disabled.
+ */
+function canUseIOUSend(): boolean {
+    return false;
+}
+
+function canUseWallet(betas: Beta[]): boolean {
+    return betas?.includes(CONST.BETAS.BETA_EXPENSIFY_WALLET) || canUseAllBetas(betas);
+}
+
+function canUseCommentLinking(betas: Beta[]): boolean {
+    return betas?.includes(CONST.BETAS.BETA_COMMENT_LINKING) || canUseAllBetas(betas);
+}
+
+/**
+ * We're requiring you to be added to the policy rooms beta on dev,
+ * since contributors have been reporting a number of false issues related to the feature being under development.
+ * See https://expensify.slack.com/archives/C01GTK53T8Q/p1641921996319400?thread_ts=1641598356.166900&cid=C01GTK53T8Q
+ */
+function canUsePolicyRooms(betas: Beta[]): boolean {
+    return betas?.includes(CONST.BETAS.POLICY_ROOMS) || canUseAllBetas(betas);
+}
+
+function canUseTasks(betas: Beta[]): boolean {
+    return betas?.includes(CONST.BETAS.TASKS) || canUseAllBetas(betas);
+}
+
+function canUseCustomStatus(betas: Beta[]): boolean {
+    return betas?.includes(CONST.BETAS.CUSTOM_STATUS) || canUseAllBetas(betas);
+}
+
+function canUseCategories(betas: Beta[]): boolean {
+    return betas?.includes(CONST.BETAS.NEW_DOT_CATEGORIES) || canUseAllBetas(betas);
+}
+
+function canUseTags(betas: Beta[]): boolean {
+    return betas?.includes(CONST.BETAS.NEW_DOT_TAGS) || canUseAllBetas(betas);
+}
+
+/**
+ * Link previews are temporarily disabled.
+ */
+function canUseLinkPreviews(): boolean {
+    return false;
+}
+
+export default {
+    canUseChronos,
+    canUsePayWithExpensify,
+    canUseDefaultRooms,
+    canUseIOUSend,
+    canUseWallet,
+    canUseCommentLinking,
+    canUsePolicyRooms,
+    canUseTasks,
+    canUseCustomStatus,
+    canUseCategories,
+    canUseTags,
+    canUseLinkPreviews,
+};
diff --git a/src/libs/PolicyUtils.js b/src/libs/PolicyUtils.js
index 164f284a4ef5..347a825f59cc 100644
--- a/src/libs/PolicyUtils.js
+++ b/src/libs/PolicyUtils.js
@@ -6,11 +6,12 @@ import ONYXKEYS from '../ONYXKEYS';
 
 /**
  * Filter out the active policies, which will exclude policies with pending deletion
+ * These are policies that we can use to create reports with in NewDot.
  * @param {Object} policies
  * @returns {Array}
  */
 function getActivePolicies(policies) {
-    return _.filter(policies, (policy) => policy && policy.isPolicyExpenseChatEnabled && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+    return _.filter(policies, (policy) => policy && (policy.isPolicyExpenseChatEnabled || policy.areChatRoomsEnabled) && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
 }
 
 /**
@@ -57,6 +58,42 @@ function hasCustomUnitsError(policy) {
     return !_.isEmpty(_.pick(lodashGet(policy, 'customUnits', {}), 'errors'));
 }
 
+/**
+ * @param {Number} value
+ * @param {Function} toLocaleDigit
+ * @returns {Number}
+ */
+function getNumericValue(value, toLocaleDigit) {
+    const numValue = parseFloat(value.toString().replace(toLocaleDigit('.'), '.'));
+    if (Number.isNaN(numValue)) {
+        return NaN;
+    }
+    return numValue.toFixed(CONST.CUSTOM_UNITS.RATE_DECIMALS);
+}
+
+/**
+ * @param {Number} value
+ * @param {Function} toLocaleDigit
+ * @returns {String}
+ */
+function getRateDisplayValue(value, toLocaleDigit) {
+    const numValue = getNumericValue(value, toLocaleDigit);
+    if (Number.isNaN(numValue)) {
+        return '';
+    }
+    return numValue.toString().replace('.', toLocaleDigit('.')).substring(0, value.length);
+}
+
+/**
+ * @param {Object} customUnitRate
+ * @param {Number} customUnitRate.rate
+ * @param {Function} toLocaleDigit
+ * @returns {String}
+ */
+function getUnitRateValue(customUnitRate, toLocaleDigit) {
+    return getRateDisplayValue(lodashGet(customUnitRate, 'rate', 0) / CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET, toLocaleDigit);
+}
+
 /**
  * Get the brick road indicator status for a policy. The policy has an error status if there is a policy member error, a custom unit error or a field error.
  *
@@ -166,12 +203,72 @@ function getIneligibleInvitees(policyMembers, personalDetails) {
     return memberEmailsToExclude;
 }
 
+/**
+ * Gets the tag from policy tags, defaults to the first if no key is provided.
+ *
+ * @param {Object} policyTags
+ * @param {String} [tagKey]
+ * @returns {Object}
+ */
+function getTag(policyTags, tagKey) {
+    if (_.isEmpty(policyTags)) {
+        return {};
+    }
+
+    const policyTagKey = tagKey || _.first(_.keys(policyTags));
+
+    return lodashGet(policyTags, policyTagKey, {});
+}
+
+/**
+ * Gets the first tag name from policy tags.
+ *
+ * @param {Object} policyTags
+ * @returns {String}
+ */
+function getTagListName(policyTags) {
+    if (_.isEmpty(policyTags)) {
+        return '';
+    }
+
+    const policyTagKeys = _.keys(policyTags) || [];
+
+    return lodashGet(policyTags, [_.first(policyTagKeys), 'name'], '');
+}
+
+/**
+ * Gets the tags of a policy for a specific key. Defaults to the first tag if no key is provided.
+ *
+ * @param {Object} policyTags
+ * @param {String} [tagKey]
+ * @returns {String}
+ */
+function getTagList(policyTags, tagKey) {
+    if (_.isEmpty(policyTags)) {
+        return {};
+    }
+
+    const policyTagKey = tagKey || _.first(_.keys(policyTags));
+
+    return lodashGet(policyTags, [policyTagKey, 'tags'], {});
+}
+
+/**
+ * @param {Object} policy
+ * @returns {Boolean}
+ */
+function isPendingDeletePolicy(policy) {
+    return policy.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+}
+
 export {
     getActivePolicies,
     hasPolicyMemberError,
     hasPolicyError,
     hasPolicyErrorFields,
     hasCustomUnitsError,
+    getNumericValue,
+    getUnitRateValue,
     getPolicyBrickRoadIndicatorStatus,
     shouldShowPolicy,
     isExpensifyTeam,
@@ -179,4 +276,8 @@ export {
     isPolicyAdmin,
     getMemberAccountIDsForWorkspace,
     getIneligibleInvitees,
+    getTag,
+    getTagListName,
+    getTagList,
+    isPendingDeletePolicy,
 };
diff --git a/src/libs/Pusher/EventType.js b/src/libs/Pusher/EventType.js
index 639e10020fc7..85ccc5e17242 100644
--- a/src/libs/Pusher/EventType.js
+++ b/src/libs/Pusher/EventType.js
@@ -5,6 +5,7 @@
 export default {
     REPORT_COMMENT: 'reportComment',
     ONYX_API_UPDATE: 'onyxApiUpdate',
+    USER_IS_LEAVING_ROOM: 'client-userIsLeavingRoom',
     USER_IS_TYPING: 'client-userIsTyping',
     MULTIPLE_EVENTS: 'multipleEvents',
     MULTIPLE_EVENT_TYPE: {
diff --git a/src/libs/PusherConnectionManager.js b/src/libs/PusherConnectionManager.ts
similarity index 83%
rename from src/libs/PusherConnectionManager.js
rename to src/libs/PusherConnectionManager.ts
index a391a4973fd4..4ab08d6dc760 100644
--- a/src/libs/PusherConnectionManager.js
+++ b/src/libs/PusherConnectionManager.ts
@@ -1,9 +1,12 @@
-import lodashGet from 'lodash/get';
+import {ValueOf} from 'type-fest';
 import * as Pusher from './Pusher/pusher';
 import * as Session from './actions/Session';
 import Log from './Log';
 import CONST from '../CONST';
 
+type EventCallbackError = {type: ValueOf<typeof CONST.ERROR>; data: {code: number}};
+type CustomAuthorizerChannel = {name: string};
+
 function init() {
     /**
      * When authTokens expire they will automatically be refreshed.
@@ -11,20 +14,17 @@ function init() {
      * current valid token to generate the signed auth response
      * needed to subscribe to Pusher channels.
      */
-    Pusher.registerCustomAuthorizer((channel) => ({
-        authorize: (socketID, callback) => {
+    Pusher.registerCustomAuthorizer((channel: CustomAuthorizerChannel) => ({
+        authorize: (socketID: string, callback: () => void) => {
             Session.authenticatePusher(socketID, channel.name, callback);
         },
     }));
 
-    /**
-     * @params {string} eventName
-     */
-    Pusher.registerSocketEventCallback((eventName, error) => {
+    Pusher.registerSocketEventCallback((eventName: string, error: EventCallbackError) => {
         switch (eventName) {
             case 'error': {
-                const errorType = lodashGet(error, 'type');
-                const code = lodashGet(error, 'data.code');
+                const errorType = error?.type;
+                const code = error?.data?.code;
                 if (errorType === CONST.ERROR.PUSHER_ERROR && code === 1006) {
                     // 1006 code happens when a websocket connection is closed. There may or may not be a reason attached indicating why the connection was closed.
                     // https://datatracker.ietf.org/doc/html/rfc6455#section-7.1.5
diff --git a/src/libs/ReceiptUtils.js b/src/libs/ReceiptUtils.js
deleted file mode 100644
index f7a53227d8d7..000000000000
--- a/src/libs/ReceiptUtils.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import lodashGet from 'lodash/get';
-import _ from 'underscore';
-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';
-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'));
-        return false;
-    }
-
-    if (lodashGet(file, 'size', 0) > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) {
-        Receipt.setUploadReceiptError(true, Localize.translateLocal('attachmentPicker.attachmentTooLarge'), Localize.translateLocal('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'));
-        return false;
-    }
-
-    return true;
-}
-
-/**
- * Grab the appropriate receipt image and thumbnail URIs based on file type
- *
- * @param {String}  path      URI to image, i.e. blob:new.expensify.com/9ef3a018-4067-47c6-b29f-5f1bd35f213d or expensify.com/receipts/w_e616108497ef940b7210ec6beb5a462d01a878f4.jpg
- * @param {String}  filename  of uploaded image or last part of remote URI
- * @returns {Object}
- */
-function getThumbnailAndImageURIs(path, filename) {
-    const isReceiptImage = Str.isImage(filename);
-
-    // For local files, we won't have a thumbnail yet
-    if (isReceiptImage && (path.startsWith('blob:') || path.startsWith('file:'))) {
-        return {thumbnail: null, image: path};
-    }
-
-    if (isReceiptImage) {
-        return {thumbnail: `${path}.1024.jpg`, image: path};
-    }
-
-    const {fileExtension} = FileUtils.splitExtensionFromFileName(filename);
-    let image = ReceiptGeneric;
-    if (fileExtension === CONST.IOU.FILE_TYPES.HTML) {
-        image = ReceiptHTML;
-    }
-
-    if (fileExtension === CONST.IOU.FILE_TYPES.DOC || fileExtension === CONST.IOU.FILE_TYPES.DOCX) {
-        image = ReceiptDoc;
-    }
-
-    if (fileExtension === CONST.IOU.FILE_TYPES.SVG) {
-        image = ReceiptSVG;
-    }
-    return {thumbnail: null, image};
-}
-
-export {validateReceipt, getThumbnailAndImageURIs};
diff --git a/src/libs/ReceiptUtils.ts b/src/libs/ReceiptUtils.ts
new file mode 100644
index 000000000000..cdc45cb119d5
--- /dev/null
+++ b/src/libs/ReceiptUtils.ts
@@ -0,0 +1,56 @@
+import Str from 'expensify-common/lib/str';
+import {ImageSourcePropType} from 'react-native';
+import * as FileUtils from './fileDownload/FileUtils';
+import CONST from '../CONST';
+import ReceiptHTML from '../../assets/images/receipt-html.png';
+import ReceiptDoc from '../../assets/images/receipt-doc.png';
+import ReceiptGeneric from '../../assets/images/receipt-generic.png';
+import ReceiptSVG from '../../assets/images/receipt-svg.png';
+
+type ThumbnailAndImageURI = {
+    image: ImageSourcePropType | string;
+    thumbnail: string | null;
+};
+
+type FileNameAndExtension = {
+    fileExtension?: string;
+    fileName?: string;
+};
+
+/**
+ * Grab the appropriate receipt image and thumbnail URIs based on file type
+ *
+ * @param path URI to image, i.e. blob:new.expensify.com/9ef3a018-4067-47c6-b29f-5f1bd35f213d or expensify.com/receipts/w_e616108497ef940b7210ec6beb5a462d01a878f4.jpg
+ * @param filename of uploaded image or last part of remote URI
+ */
+function getThumbnailAndImageURIs(path: string, filename: string): ThumbnailAndImageURI {
+    const isReceiptImage = Str.isImage(filename);
+
+    // For local files, we won't have a thumbnail yet
+    if (isReceiptImage && (path.startsWith('blob:') || path.startsWith('file:'))) {
+        return {thumbnail: null, image: path};
+    }
+
+    if (isReceiptImage) {
+        return {thumbnail: `${path}.1024.jpg`, image: path};
+    }
+
+    const {fileExtension} = FileUtils.splitExtensionFromFileName(filename) as FileNameAndExtension;
+    let image = ReceiptGeneric;
+    if (fileExtension === CONST.IOU.FILE_TYPES.HTML) {
+        image = ReceiptHTML;
+    }
+
+    if (fileExtension === CONST.IOU.FILE_TYPES.DOC || fileExtension === CONST.IOU.FILE_TYPES.DOCX) {
+        image = ReceiptDoc;
+    }
+
+    if (fileExtension === CONST.IOU.FILE_TYPES.SVG) {
+        image = ReceiptSVG;
+    }
+
+    return {thumbnail: null, image};
+}
+
+// eslint-disable-next-line import/prefer-default-export
+export {getThumbnailAndImageURIs};
diff --git a/src/libs/ReportActionComposeFocusManager.js b/src/libs/ReportActionComposeFocusManager.ts
similarity index 56%
rename from src/libs/ReportActionComposeFocusManager.js
rename to src/libs/ReportActionComposeFocusManager.ts
index 7f31b17aaa57..ca4f9d77898b 100644
--- a/src/libs/ReportActionComposeFocusManager.js
+++ b/src/libs/ReportActionComposeFocusManager.ts
@@ -1,20 +1,22 @@
-import _ from 'underscore';
 import React from 'react';
+import {TextInput} from 'react-native';
 
-const composerRef = React.createRef();
+type FocusCallback = () => void;
+
+const composerRef = React.createRef<TextInput>();
+const editComposerRef = React.createRef<TextInput>();
 // There are two types of composer: general composer (edit composer) and main composer.
 // The general composer callback will take priority if it exists.
-let focusCallback = null;
-let mainComposerFocusCallback = null;
+let focusCallback: FocusCallback | null = null;
+let mainComposerFocusCallback: FocusCallback | null = null;
 
 /**
  * Register a callback to be called when focus is requested.
  * Typical uses of this would be call the focus on the ReportActionComposer.
  *
- * @param {Function} callback callback to register
- * @param {Boolean} isMainComposer
+ * @param callback callback to register
  */
-function onComposerFocus(callback, isMainComposer = false) {
+function onComposerFocus(callback: FocusCallback, isMainComposer = false) {
     if (isMainComposer) {
         mainComposerFocusCallback = callback;
     } else {
@@ -24,11 +26,10 @@ function onComposerFocus(callback, isMainComposer = false) {
 
 /**
  * Request focus on the ReportActionComposer
- *
  */
 function focus() {
-    if (!_.isFunction(focusCallback)) {
-        if (!_.isFunction(mainComposerFocusCallback)) {
+    if (typeof focusCallback !== 'function') {
+        if (typeof mainComposerFocusCallback !== 'function') {
             return;
         }
 
@@ -41,8 +42,6 @@ function focus() {
 
 /**
  * Clear the registered focus callback
- *
- * @param {Boolean} isMainComposer
  */
 function clear(isMainComposer = false) {
     if (isMainComposer) {
@@ -54,10 +53,16 @@ function clear(isMainComposer = false) {
 
 /**
  * Exposes the current focus state of the report action composer.
- * @return {Boolean} isFocused
  */
-function isFocused() {
-    return composerRef.current && composerRef.current.isFocused();
+function isFocused(): boolean {
+    return !!composerRef.current?.isFocused();
+}
+
+/**
+ * Exposes the current focus state of the edit message composer.
+ */
+function isEditFocused(): boolean {
+    return !!editComposerRef.current?.isFocused();
 }
 
 export default {
@@ -66,4 +71,6 @@ export default {
     focus,
     clear,
     isFocused,
+    editComposerRef,
+    isEditFocused,
 };
diff --git a/src/libs/ReportActionsUtils.js b/src/libs/ReportActionsUtils.js
index 9bb365c0f42a..67c44784eeb2 100644
--- a/src/libs/ReportActionsUtils.js
+++ b/src/libs/ReportActionsUtils.js
@@ -1,9 +1,9 @@
+/* eslint-disable rulesdir/prefer-underscore-method */
 import lodashGet from 'lodash/get';
 import _ from 'underscore';
-import lodashMerge from 'lodash/merge';
+import {max, parseISO, isEqual} from 'date-fns';
 import lodashFindLast from 'lodash/findLast';
 import Onyx from 'react-native-onyx';
-import moment from 'moment';
 import * as CollectionUtils from './CollectionUtils';
 import CONST from '../CONST';
 import ONYXKEYS from '../ONYXKEYS';
@@ -122,6 +122,7 @@ function isThreadParentMessage(reportAction = {}, reportID) {
  * @param {Object} report
  * @param {Object} [allReportActionsParam]
  * @returns {Object}
+ * @deprecated Use Onyx.connect() or withOnyx() instead
  */
 function getParentReportAction(report, allReportActionsParam = undefined) {
     if (!report || !report.parentReportID || !report.parentReportActionID) {
@@ -248,6 +249,23 @@ function extractLinksFromMessageHtml(reportAction) {
     return _.map([...htmlContent.matchAll(regex)], (match) => match[1]);
 }
 
+/**
+ * Returns the report action immediately before the specified index.
+ * @param {Array} reportActions - all actions
+ * @param {Number} actionIndex - index of the action
+ * @returns {Object|null}
+ */
+function findPreviousAction(reportActions, actionIndex) {
+    for (let i = actionIndex + 1; i < reportActions.length; i++) {
+        // Find the next non-pending deletion report action, as the pending delete action means that it is not displayed in the UI, but still is in the report actions list.
+        // If we are offline, all actions are pending but shown in the UI, so we take the previous action, even if it is a delete.
+        if (isNetworkOffline || reportActions[i].pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
+            return reportActions[i];
+        }
+    }
+    return null;
+}
+
 /**
  * Returns true when the report action immediately before the specified index is a comment made by the same actor who who is leaving a comment in the action at the specified index.
  * Also checks to ensure that the comment is not too old to be shown as a grouped comment.
@@ -257,9 +275,7 @@ function extractLinksFromMessageHtml(reportAction) {
  * @returns {Boolean}
  */
 function isConsecutiveActionMadeByPreviousActor(reportActions, actionIndex) {
-    // Find the next non-pending deletion report action, as the pending delete action means that it is not displayed in the UI, but still is in the report actions list.
-    // If we are offline, all actions are pending but shown in the UI, so we take the previous action, even if it is a delete.
-    const previousAction = _.find(_.drop(reportActions, actionIndex + 1), (action) => isNetworkOffline || action.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+    const previousAction = findPreviousAction(reportActions, actionIndex);
     const currentAction = reportActions[actionIndex];
 
     // It's OK for there to be no previous action, and in that case, false will be returned
@@ -331,11 +347,7 @@ function shouldReportActionBeVisible(reportAction, key) {
     }
 
     // Filter out any unsupported reportAction types
-    if (
-        !_.has(CONST.REPORT.ACTIONS.TYPE, reportAction.actionName) &&
-        !_.contains(_.values(CONST.REPORT.ACTIONS.TYPE.POLICYCHANGELOG), reportAction.actionName) &&
-        !_.contains(_.values(CONST.REPORT.ACTIONS.TYPE.TASK), reportAction.actionName)
-    ) {
+    if (!Object.values(CONST.REPORT.ACTIONS.TYPE).includes(reportAction.actionName) && !Object.values(CONST.REPORT.ACTIONS.TYPE.POLICYCHANGELOG).includes(reportAction.actionName)) {
         return false;
     }
 
@@ -350,7 +362,7 @@ function shouldReportActionBeVisible(reportAction, key) {
 
     // All other actions are displayed except thread parents, deleted, or non-pending actions
     const isDeleted = isDeletedAction(reportAction);
-    const isPending = !_.isEmpty(reportAction.pendingAction);
+    const isPending = !!reportAction.pendingAction;
     return !isDeleted || isPending || isDeletedParentAction(reportAction);
 }
 
@@ -370,7 +382,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)
+    );
 }
 
 /**
@@ -379,14 +394,24 @@ function shouldReportActionBeVisibleAsLastAction(reportAction) {
  * @return {Object}
  */
 function getLastVisibleAction(reportID, actionsToMerge = {}) {
-    const actions = _.toArray(lodashMerge({}, allReportActions[reportID], actionsToMerge));
-    const visibleActions = _.filter(actions, (action) => shouldReportActionBeVisibleAsLastAction(action));
+    const updatedActionsToMerge = {};
+    if (actionsToMerge && Object.keys(actionsToMerge).length !== 0) {
+        Object.keys(actionsToMerge).forEach(
+            (actionToMergeID) => (updatedActionsToMerge[actionToMergeID] = {...allReportActions[reportID][actionToMergeID], ...actionsToMerge[actionToMergeID]}),
+        );
+    }
+    const actions = Object.values({
+        ...allReportActions[reportID],
+        ...updatedActionsToMerge,
+    });
+    const visibleActions = actions.filter((action) => shouldReportActionBeVisibleAsLastAction(action));
 
-    if (_.isEmpty(visibleActions)) {
+    if (visibleActions.length === 0) {
         return {};
     }
-
-    return _.max(visibleActions, (action) => moment.utc(action.created).valueOf());
+    const maxDate = max(visibleActions.map((action) => parseISO(action.created)));
+    const maxAction = visibleActions.find((action) => isEqual(parseISO(action.created), maxDate));
+    return maxAction;
 }
 
 /**
@@ -401,7 +426,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 +641,22 @@ 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);
+}
+
+// eslint-disable-next-line rulesdir/no-negated-variables
+function isNotifiableReportAction(reportAction) {
+    return reportAction && _.contains([CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT, CONST.REPORT.ACTIONS.TYPE.IOU, CONST.REPORT.ACTIONS.TYPE.MODIFIEDEXPENSE], reportAction.actionName);
+}
+
 export {
     getSortedReportActions,
     getLastVisibleAction,
@@ -653,4 +694,6 @@ export {
     isSplitBillAction,
     isTaskAction,
     getAllReportActions,
+    isReportActionAttachment,
+    isNotifiableReportAction,
 };
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 6167a04ada2f..f41ad0b75b42 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -1,3 +1,4 @@
+/* eslint-disable rulesdir/prefer-underscore-method */
 import _ from 'underscore';
 import {format, parseISO} from 'date-fns';
 import Str from 'expensify-common/lib/str';
@@ -14,6 +15,7 @@ import ROUTES from '../ROUTES';
 import * as NumberUtils from './NumberUtils';
 import * as ReportActionsUtils from './ReportActionsUtils';
 import * as TransactionUtils from './TransactionUtils';
+import * as Url from './Url';
 import Permissions from './Permissions';
 import DateUtils from './DateUtils';
 import linkingConfig from './Navigation/linkingConfig';
@@ -86,8 +88,10 @@ function getChatType(report) {
  * @returns {Object}
  */
 function getPolicy(policyID) {
-    const policy = lodashGet(allPolicies, `${ONYXKEYS.COLLECTION.POLICY}${policyID}`) || {};
-    return policy;
+    if (!allPolicies || !policyID) {
+        return {};
+    }
+    return allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`] || {};
 }
 
 /**
@@ -126,12 +130,6 @@ function getPolicyName(report, returnEmptyIfNotFound = false, policy = undefined
     // since they can also be accessed by people who aren't in the workspace
     const policyName = lodashGet(finalPolicy, 'name') || report.policyName || report.oldPolicyName || noPolicyFound;
 
-    // The SBE and SAASTR policies have the user name in its name, however, we do not want to show that
-    if (lodashGet(finalPolicy, 'owner') === CONST.EMAIL.SBE || lodashGet(finalPolicy, 'owner') === CONST.EMAIL.SAASTR) {
-        const policyNameParts = policyName.split(' ');
-        if (!Str.isValidEmail(policyNameParts[0])) return policyName;
-        return policyNameParts.length > 1 ? policyNameParts.slice(1).join(' ') : policyName;
-    }
     return policyName;
 }
 
@@ -159,7 +157,7 @@ function getReportParticipantsTitle(accountIDs) {
  * @returns {Boolean}
  */
 function isChatReport(report) {
-    return lodashGet(report, 'type') === CONST.REPORT.TYPE.CHAT;
+    return report && report.type === CONST.REPORT.TYPE.CHAT;
 }
 
 /**
@@ -169,7 +167,7 @@ function isChatReport(report) {
  * @returns {Boolean}
  */
 function isExpenseReport(report) {
-    return lodashGet(report, 'type') === CONST.REPORT.TYPE.EXPENSE;
+    return report && report.type === CONST.REPORT.TYPE.EXPENSE;
 }
 
 /**
@@ -179,7 +177,7 @@ function isExpenseReport(report) {
  * @returns {Boolean}
  */
 function isIOUReport(report) {
-    return lodashGet(report, 'type') === CONST.REPORT.TYPE.IOU;
+    return report && report.type === CONST.REPORT.TYPE.IOU;
 }
 
 /**
@@ -189,27 +187,41 @@ function isIOUReport(report) {
  * @returns {Boolean}
  */
 function isTaskReport(report) {
-    return lodashGet(report, 'type') === CONST.REPORT.TYPE.TASK;
+    return report && report.type === CONST.REPORT.TYPE.TASK;
 }
 
 /**
- * Checks if a report is an open task report.
+ * Checks if a task has been cancelled
+ * When a task is deleted, the parentReportAction is updated to have a isDeletedParentAction deleted flag
+ * This is because when you delete a task, we still allow you to chat on the report itself
+ * There's another situation where you don't have access to the parentReportAction (because it was created in a chat you don't have access to)
+ * In this case, we have added the key to the report itself
  *
  * @param {Object} report
+ * @param {Object} parentReportAction
  * @returns {Boolean}
  */
-function isOpenTaskReport(report) {
-    return isTaskReport(report) && report.stateNum === CONST.REPORT.STATE_NUM.OPEN && report.statusNum === CONST.REPORT.STATUS.OPEN;
+function isCanceledTaskReport(report = {}, parentReportAction = {}) {
+    if (!_.isEmpty(parentReportAction) && lodashGet(parentReportAction, ['message', 0, 'isDeletedParentAction'], false)) {
+        return true;
+    }
+
+    if (!_.isEmpty(report) && report.isDeletedParentAction) {
+        return true;
+    }
+
+    return false;
 }
 
 /**
- * Checks if the current user is assigned to the task report
+ * Checks if a report is an open task report.
  *
  * @param {Object} report
+ * @param {Object} parentReportAction - The parent report action of the report (Used to check if the task has been canceled)
  * @returns {Boolean}
  */
-function isCanceledTaskReport(report) {
-    return isTaskReport(report) && report.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED && report.statusNum === CONST.REPORT.STATUS.CLOSED;
+function isOpenTaskReport(report, parentReportAction = {}) {
+    return isTaskReport(report) && !isCanceledTaskReport(report, parentReportAction) && report.stateNum === CONST.REPORT.STATE_NUM.OPEN && report.statusNum === CONST.REPORT.STATUS.OPEN;
 }
 
 /**
@@ -229,7 +241,7 @@ function isCompletedTaskReport(report) {
  * @returns {Boolean}
  */
 function isReportManager(report) {
-    return lodashGet(report, 'managerID') === currentUserAccountID;
+    return report && report.managerID === currentUserAccountID;
 }
 
 /**
@@ -239,7 +251,7 @@ function isReportManager(report) {
  * @returns {Boolean}
  */
 function isReportApproved(report) {
-    return lodashGet(report, 'stateNum') === CONST.REPORT.STATE_NUM.SUBMITTED && lodashGet(report, 'statusNum') === CONST.REPORT.STATUS.APPROVED;
+    return report && report.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED && report.statusNum === CONST.REPORT.STATUS.APPROVED;
 }
 
 /**
@@ -263,9 +275,11 @@ function sortReportsByLastRead(reports) {
  * @returns {Boolean}
  */
 function isSettled(reportID) {
-    const report = lodashGet(allReports, `${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {});
-
-    if (_.isEmpty(report) || report.isWaitingOnBankAccount) {
+    if (!allReports) {
+        return false;
+    }
+    const report = allReports[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`] || {};
+    if ((typeof report === 'object' && Object.keys(report).length === 0) || report.isWaitingOnBankAccount) {
         return false;
     }
 
@@ -279,7 +293,10 @@ function isSettled(reportID) {
  * @returns {Boolean}
  */
 function isCurrentUserSubmitter(reportID) {
-    const report = lodashGet(allReports, `${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {});
+    if (!allReports) {
+        return false;
+    }
+    const report = allReports[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`] || {};
     return report && report.ownerEmail === currentUserEmail;
 }
 
@@ -386,8 +403,7 @@ function isChatRoom(report) {
  * @returns {Boolean}
  */
 function isPublicRoom(report) {
-    const visibility = lodashGet(report, 'visibility', '');
-    return visibility === CONST.REPORT.VISIBILITY.PUBLIC || visibility === CONST.REPORT.VISIBILITY.PUBLIC_ANNOUNCE;
+    return report && (report.visibility === CONST.REPORT.VISIBILITY.PUBLIC || report.visibility === CONST.REPORT.VISIBILITY.PUBLIC_ANNOUNCE);
 }
 
 /**
@@ -397,8 +413,7 @@ function isPublicRoom(report) {
  * @returns {Boolean}
  */
 function isPublicAnnounceRoom(report) {
-    const visibility = lodashGet(report, 'visibility', '');
-    return visibility === CONST.REPORT.VISIBILITY.PUBLIC_ANNOUNCE;
+    return report && report.visibility === CONST.REPORT.VISIBILITY.PUBLIC_ANNOUNCE;
 }
 
 /**
@@ -408,7 +423,7 @@ function isPublicAnnounceRoom(report) {
  * @returns {String}
  */
 function getBankAccountRoute(report) {
-    return isPolicyExpenseChat(report) ? ROUTES.getBankAccountRoute('', report.policyID) : ROUTES.SETTINGS_ADD_BANK_ACCOUNT;
+    return isPolicyExpenseChat(report) ? ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute('', report.policyID) : ROUTES.SETTINGS_ADD_BANK_ACCOUNT;
 }
 
 /**
@@ -490,7 +505,7 @@ function shouldDisableDetailPage(report) {
  */
 function isExpensifyOnlyParticipantInReport(report) {
     const reportParticipants = _.without(lodashGet(report, 'participantAccountIDs', []), currentUserAccountID);
-    return lodashGet(report, 'participantAccountIDs', []).length === 1 && _.some(reportParticipants, (accountID) => _.contains(CONST.EXPENSIFY_ACCOUNT_IDS, accountID));
+    return reportParticipants.length === 1 && _.some(reportParticipants, (accountID) => _.contains(CONST.EXPENSIFY_ACCOUNT_IDS, accountID));
 }
 
 /**
@@ -568,7 +583,7 @@ function findLastAccessedReport(reports, ignoreDomainRooms, policies, isFirstTim
  * @returns {Boolean}
  */
 function isArchivedRoom(report) {
-    return lodashGet(report, ['statusNum']) === CONST.REPORT.STATUS.CLOSED && lodashGet(report, ['stateNum']) === CONST.REPORT.STATE_NUM.SUBMITTED;
+    return report && report.statusNum === CONST.REPORT.STATUS.CLOSED && report.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED;
 }
 
 /**
@@ -736,7 +751,7 @@ function isMoneyRequest(reportOrID) {
  * @returns {Boolean}
  */
 function isMoneyRequestReport(reportOrID) {
-    const report = _.isObject(reportOrID) ? reportOrID : allReports[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`];
+    const report = typeof reportOrID === 'object' ? reportOrID : allReports[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`];
     return isIOUReport(report) || isExpenseReport(report);
 }
 
@@ -833,8 +848,30 @@ function hasAutomatedExpensifyAccountIDs(accountIDs) {
  * @returns {Array}
  */
 function getReportRecipientAccountIDs(report, currentLoginAccountID) {
-    const participantAccountIDs = isTaskReport(report) ? [report.managerID] : lodashGet(report, 'participantAccountIDs');
-    const reportParticipants = _.without(participantAccountIDs, currentLoginAccountID);
+    let finalReport = report;
+    // In 1:1 chat threads, the participants will be the same as parent report. If a report is specifically a 1:1 chat thread then we will
+    // get parent report and use its participants array.
+    if (isThread(report) && !(isTaskReport(report) || isMoneyRequestReport(report))) {
+        const parentReport = lodashGet(allReports, [`${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`]);
+        if (hasSingleParticipant(parentReport)) {
+            finalReport = parentReport;
+        }
+    }
+
+    let finalParticipantAccountIDs = [];
+    if (isMoneyRequestReport(report)) {
+        // For money requests i.e the IOU (1:1 person) and Expense (1:* person) reports, use the full `initialParticipantAccountIDs` array
+        // and add the `ownerAccountId`. Money request reports don't add `ownerAccountId` in `participantAccountIDs` array
+        finalParticipantAccountIDs = _.union(lodashGet(finalReport, 'participantAccountIDs'), [report.ownerAccountID]);
+    } else if (isTaskReport(report)) {
+        // Task reports `managerID` will change when assignee is changed, in that case the old `managerID` is still present in `participantAccountIDs`
+        // array along with the new one. We only need the `managerID` as a participant here.
+        finalParticipantAccountIDs = [report.managerID];
+    } else {
+        finalParticipantAccountIDs = lodashGet(finalReport, 'participantAccountIDs');
+    }
+
+    const reportParticipants = _.without(finalParticipantAccountIDs, currentLoginAccountID);
     const participantsWithoutExpensifyAccountIDs = _.difference(reportParticipants, CONST.EXPENSIFY_ACCOUNT_IDS);
     return participantsWithoutExpensifyAccountIDs;
 }
@@ -866,9 +903,13 @@ function canShowReportRecipientLocalTime(personalDetails, report, accountID) {
 /**
  * Shorten last message text to fixed length and trim spaces.
  * @param {String} lastMessageText
+ * @param {Boolean} isModifiedExpenseMessage
  * @returns {String}
  */
-function formatReportLastMessageText(lastMessageText) {
+function formatReportLastMessageText(lastMessageText, isModifiedExpenseMessage = false) {
+    if (isModifiedExpenseMessage) {
+        return String(lastMessageText).trim().replace(CONST.REGEX.LINE_BREAK, '').trim();
+    }
     return String(lastMessageText).trim().replace(CONST.REGEX.AFTER_FIRST_LINE_BREAK, '').substring(0, CONST.REPORT.LAST_MESSAGE_TEXT_MAX_LENGTH).trim();
 }
 
@@ -911,25 +952,34 @@ function getIconsForParticipants(participants, personalDetails) {
     for (let i = 0; i < participantsList.length; i++) {
         const accountID = participantsList[i];
         const avatarSource = UserUtils.getAvatar(lodashGet(personalDetails, [accountID, 'avatar'], ''), accountID);
-        participantDetails.push([
-            accountID,
-            lodashGet(personalDetails, [accountID, 'displayName']) || lodashGet(personalDetails, [accountID, 'login'], ''),
-            lodashGet(personalDetails, [accountID, 'firstName'], ''),
-            avatarSource,
-        ]);
+        const displayNameLogin = lodashGet(personalDetails, [accountID, 'displayName']) || lodashGet(personalDetails, [accountID, 'login'], '');
+        participantDetails.push([accountID, displayNameLogin, avatarSource, lodashGet(personalDetails, [accountID, 'fallBackIcon'])]);
     }
 
-    // Sort all logins by first name (which is the second element in the array)
-    const sortedParticipantDetails = participantDetails.sort((a, b) => a[2] - b[2]);
+    const sortedParticipantDetails = _.chain(participantDetails)
+        .sort((first, second) => {
+            // First sort by displayName/login
+            const displayNameLoginOrder = first[1].localeCompare(second[1]);
+            if (displayNameLoginOrder !== 0) {
+                return displayNameLoginOrder;
+            }
 
-    // Now that things are sorted, gather only the avatars (third element in the array) and return those
+            // Then fallback on accountID as the final sorting criteria.
+            // This will ensure that the order of avatars with same login/displayName
+            // stay consistent across all users and devices
+            return first[0] > second[0];
+        })
+        .value();
+
+    // Now that things are sorted, gather only the avatars (second element in the array) and return those
     const avatars = [];
     for (let i = 0; i < sortedParticipantDetails.length; i++) {
         const userIcon = {
             id: sortedParticipantDetails[i][0],
-            source: sortedParticipantDetails[i][3],
+            source: sortedParticipantDetails[i][2],
             type: CONST.ICON_TYPE_AVATAR,
             name: sortedParticipantDetails[i][1],
+            fallBackIcon: sortedParticipantDetails[i][3],
         };
         avatars.push(userIcon);
     }
@@ -963,13 +1013,12 @@ function getWorkspaceIcon(report, policy = undefined) {
  * @param {Object} report
  * @param {Object} personalDetails
  * @param {*} [defaultIcon]
- * @param {Boolean} [isPayer]
  * @param {String} [defaultName]
  * @param {Number} [defaultAccountID]
  * @param {Object} [policy]
  * @returns {Array<*>}
  */
-function getIcons(report, personalDetails, defaultIcon = null, isPayer = false, defaultName = '', defaultAccountID = -1, policy = undefined) {
+function getIcons(report, personalDetails, defaultIcon = null, defaultName = '', defaultAccountID = -1, policy = undefined) {
     if (_.isEmpty(report)) {
         const fallbackIcon = {
             source: defaultIcon || Expensicons.FallbackAvatar,
@@ -987,6 +1036,7 @@ function getIcons(report, personalDetails, defaultIcon = null, isPayer = false,
             id: parentReportAction.actorAccountID,
             type: CONST.ICON_TYPE_AVATAR,
             name: lodashGet(personalDetails, [parentReportAction.actorAccountID, 'displayName'], ''),
+            fallbackIcon: lodashGet(personalDetails, [parentReportAction.actorAccountID, 'fallbackIcon']),
         };
 
         return [memberIcon, workspaceIcon];
@@ -1001,6 +1051,7 @@ function getIcons(report, personalDetails, defaultIcon = null, isPayer = false,
             source: UserUtils.getAvatar(lodashGet(personalDetails, [actorAccountID, 'avatar']), actorAccountID),
             name: actorDisplayName,
             type: CONST.ICON_TYPE_AVATAR,
+            fallbackIcon: lodashGet(personalDetails, [parentReportAction.actorAccountID, 'fallbackIcon']),
         };
 
         if (isWorkspaceThread(report)) {
@@ -1015,6 +1066,7 @@ function getIcons(report, personalDetails, defaultIcon = null, isPayer = false,
             source: UserUtils.getAvatar(lodashGet(personalDetails, [report.ownerAccountID, 'avatar']), report.ownerAccountID),
             type: CONST.ICON_TYPE_AVATAR,
             name: lodashGet(personalDetails, [report.ownerAccountID, 'displayName'], ''),
+            fallbackIcon: lodashGet(personalDetails, [report.ownerAccountID, 'fallbackIcon']),
         };
 
         if (isWorkspaceTaskReport(report)) {
@@ -1047,6 +1099,7 @@ function getIcons(report, personalDetails, defaultIcon = null, isPayer = false,
             id: report.ownerAccountID,
             type: CONST.ICON_TYPE_AVATAR,
             name: lodashGet(personalDetails, [report.ownerAccountID, 'displayName'], ''),
+            fallbackIcon: lodashGet(personalDetails, [report.ownerAccountID, 'fallbackIcon']),
         };
         return isExpenseReport(report) ? [memberIcon, workspaceIcon] : [workspaceIcon, memberIcon];
     }
@@ -1056,14 +1109,16 @@ function getIcons(report, personalDetails, defaultIcon = null, isPayer = false,
             id: report.managerID,
             type: CONST.ICON_TYPE_AVATAR,
             name: lodashGet(personalDetails, [report.managerID, 'displayName'], ''),
+            fallbackIcon: lodashGet(personalDetails, [report.managerID, 'fallbackIcon']),
         };
-
         const ownerIcon = {
             id: report.ownerAccountID,
             source: UserUtils.getAvatar(lodashGet(personalDetails, [report.ownerAccountID, 'avatar']), report.ownerAccountID),
             type: CONST.ICON_TYPE_AVATAR,
             name: lodashGet(personalDetails, [report.ownerAccountID, 'displayName'], ''),
+            fallbackIcon: lodashGet(personalDetails, [report.ownerAccountID, 'fallbackIcon']),
         };
+        const isPayer = currentUserAccountID === report.managerID;
 
         return isPayer ? [managerIcon, ownerIcon] : [ownerIcon, managerIcon];
     }
@@ -1139,6 +1194,17 @@ function getDisplayNamesWithTooltips(personalDetailsList, isMultipleParticipantR
     });
 }
 
+/**
+ * Get the report given a reportID
+ *
+ * @param {String} reportID
+ * @returns {Object}
+ */
+function getReport(reportID) {
+    // Deleted reports are set to null and lodashGet will still return null in that case, so we need to add an extra check
+    return lodashGet(allReports, `${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {}) || {};
+}
+
 /**
  * Determines if a report has an IOU that is waiting for an action from the current user (either Pay or Add a credit bank account)
  *
@@ -1150,6 +1216,10 @@ function isWaitingForIOUActionFromCurrentUser(report) {
         return false;
     }
 
+    if (isArchivedRoom(getReport(report.parentReportID))) {
+        return false;
+    }
+
     const policy = getPolicy(report.policyID);
     if (policy.type === CONST.POLICY.TYPE.CORPORATE) {
         // If the report is already settled, there's no action required from any user.
@@ -1179,8 +1249,15 @@ function isWaitingForIOUActionFromCurrentUser(report) {
     return false;
 }
 
-function isWaitingForTaskCompleteFromAssignee(report) {
-    return isTaskReport(report) && isReportManager(report) && isOpenTaskReport(report);
+/**
+ * Checks if a report is an open task report assigned to current user.
+ *
+ * @param {Object} report
+ * @param {Object} parentReportAction - The parent report action of the report (Used to check if the task has been canceled)
+ * @returns {Boolean}
+ */
+function isWaitingForTaskCompleteFromAssignee(report, parentReportAction = {}) {
+    return isTaskReport(report) && isReportManager(report) && isOpenTaskReport(report, parentReportAction);
 }
 
 /**
@@ -1268,18 +1345,8 @@ function getMoneyRequestReportName(report, policy = undefined) {
 }
 
 /**
- * Get the report given a reportID
- *
- * @param {String} reportID
- * @returns {Object}
- */
-function getReport(reportID) {
-    // Deleted reports are set to null and lodashGet will still return null in that case, so we need to add an extra check
-    return lodashGet(allReports, `${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {}) || {};
-}
-
-/**
- * Gets transaction created, amount, currency and comment
+ * Gets transaction created, amount, currency, comment, and waypoints (for distance request)
+ * into a flat object. Used for displaying transactions and sending them in API commands
  *
  * @param {Object} transaction
  * @returns {Object}
@@ -1292,6 +1359,10 @@ function getTransactionDetails(transaction) {
         currency: TransactionUtils.getCurrency(transaction),
         comment: TransactionUtils.getDescription(transaction),
         merchant: TransactionUtils.getMerchant(transaction),
+        waypoints: TransactionUtils.getWaypoints(transaction),
+        category: TransactionUtils.getCategory(transaction),
+        billable: TransactionUtils.getBillable(transaction),
+        tag: TransactionUtils.getTag(transaction),
     };
 }
 
@@ -1405,6 +1476,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', {
@@ -1417,7 +1492,7 @@ function getTransactionReportName(reportAction) {
  * Get money request message for an IOU report
  *
  * @param {Object} report
- * @param {Object} [reportAction={}]
+ * @param {Object} [reportAction={}] This can be either a report preview action or the IOU action
  * @param {Boolean} [shouldConsiderReceiptBeingScanned=false]
  * @returns  {String}
  */
@@ -1447,14 +1522,15 @@ function getReportPreviewMessage(report, reportAction = {}, shouldConsiderReceip
     }
 
     if (isSettled(report.reportID)) {
-        // A settled report preview message can come in three formats "paid ... using Paypal.me", "paid ... elsewhere" or "paid ... using Expensify"
+        // A settled report preview message can come in three formats "paid ... elsewhere" or "paid ... with Expensify"
         let translatePhraseKey = 'iou.paidElsewhereWithAmount';
-        if (reportActionMessage.match(/ Paypal.me$/)) {
-            translatePhraseKey = 'iou.paidUsingPaypalWithAmount';
-        } else if (reportActionMessage.match(/ using Expensify$/)) {
-            translatePhraseKey = 'iou.paidUsingExpensifyWithAmount';
+        if (
+            _.contains([CONST.IOU.PAYMENT_TYPE.VBBA, CONST.IOU.PAYMENT_TYPE.EXPENSIFY], reportAction.originalMessage.paymentType) ||
+            reportActionMessage.match(/ (with Expensify|using Expensify)$/)
+        ) {
+            translatePhraseKey = 'iou.paidWithExpensifyWithAmount';
         }
-        return Localize.translateLocal(translatePhraseKey, {amount: formattedAmount});
+        return Localize.translateLocal(translatePhraseKey, {amount: formattedAmount, payer: payerName});
     }
 
     if (report.isWaitingOnBankAccount) {
@@ -1492,6 +1568,9 @@ function getProperSchemaForModifiedExpenseMessage(newValue, oldValue, valueName,
 /**
  * Get the report action message when expense has been modified.
  *
+ * ModifiedExpense::getNewDotComment in Web-Expensify should match this.
+ * If we change this function be sure to update the backend as well.
+ *
  * @param {Object} reportAction
  * @returns {String}
  */
@@ -1533,6 +1612,21 @@ function getModifiedExpenseMessage(reportAction) {
     if (hasModifiedMerchant) {
         return getProperSchemaForModifiedExpenseMessage(reportActionOriginalMessage.merchant, reportActionOriginalMessage.oldMerchant, Localize.translateLocal('common.merchant'), true);
     }
+
+    const hasModifiedCategory = _.has(reportActionOriginalMessage, 'oldCategory') && _.has(reportActionOriginalMessage, 'category');
+    if (hasModifiedCategory) {
+        return getProperSchemaForModifiedExpenseMessage(reportActionOriginalMessage.category, reportActionOriginalMessage.oldCategory, Localize.translateLocal('common.category'), true);
+    }
+
+    const hasModifiedTag = _.has(reportActionOriginalMessage, 'oldTag') && _.has(reportActionOriginalMessage, 'tag');
+    if (hasModifiedTag) {
+        return getProperSchemaForModifiedExpenseMessage(reportActionOriginalMessage.tag, reportActionOriginalMessage.oldTag, Localize.translateLocal('common.tag'), true);
+    }
+
+    const hasModifiedBillable = _.has(reportActionOriginalMessage, 'oldBillable') && _.has(reportActionOriginalMessage, 'billable');
+    if (hasModifiedBillable) {
+        return getProperSchemaForModifiedExpenseMessage(reportActionOriginalMessage.billable, reportActionOriginalMessage.oldBillable, Localize.translateLocal('iou.request'), true);
+    }
 }
 
 /**
@@ -1573,6 +1667,22 @@ function getModifiedExpenseOriginalMessage(oldTransaction, transactionChanges, i
         originalMessage.currency = lodashGet(transactionChanges, 'currency', originalMessage.oldCurrency);
     }
 
+    if (_.has(transactionChanges, 'category')) {
+        originalMessage.oldCategory = TransactionUtils.getCategory(oldTransaction);
+        originalMessage.category = transactionChanges.category;
+    }
+
+    if (_.has(transactionChanges, 'tag')) {
+        originalMessage.oldTag = TransactionUtils.getTag(oldTransaction);
+        originalMessage.tag = transactionChanges.tag;
+    }
+
+    if (_.has(transactionChanges, 'billable')) {
+        const oldBillable = TransactionUtils.getBillable(oldTransaction);
+        originalMessage.oldBillable = oldBillable ? Localize.translateLocal('common.billable').toLowerCase() : Localize.translateLocal('common.nonBillable').toLowerCase();
+        originalMessage.billable = transactionChanges.billable ? Localize.translateLocal('common.billable').toLowerCase() : Localize.translateLocal('common.nonBillable').toLowerCase();
+    }
+
     return originalMessage;
 }
 
@@ -1589,6 +1699,29 @@ function getParentReport(report) {
     return lodashGet(allReports, `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`, {});
 }
 
+/**
+ * Returns the root parentReport if the given report is nested.
+ * Uses recursion to iterate any depth of nested reports.
+ *
+ * @param {Object} report
+ * @returns {Object}
+ */
+function getRootParentReport(report) {
+    if (!report) {
+        return {};
+    }
+
+    // Returns the current report as the root report, because it does not have a parentReportID
+    if (!report.parentReportID) {
+        return report;
+    }
+
+    const parentReport = getReport(report.parentReportID);
+
+    // Runs recursion to iterate a parent report
+    return getRootParentReport(parentReport);
+}
+
 /**
  * Get the title for a report.
  *
@@ -1598,13 +1731,13 @@ function getParentReport(report) {
  */
 function getReportName(report, policy = undefined) {
     let formattedName;
+    const parentReportAction = ReportActionsUtils.getParentReportAction(report);
     if (isChatThread(report)) {
-        const parentReportAction = ReportActionsUtils.getParentReportAction(report);
         if (ReportActionsUtils.isTransactionThread(parentReportAction)) {
             return getTransactionReportName(parentReportAction);
         }
 
-        const isAttachment = _.has(parentReportAction, 'isAttachment') ? parentReportAction.isAttachment : isReportMessageAttachment(_.last(lodashGet(parentReportAction, 'message', [{}])));
+        const isAttachment = ReportActionsUtils.isReportActionAttachment(parentReportAction);
         const parentReportActionMessage = lodashGet(parentReportAction, ['message', 0, 'text'], '').replace(/(\r\n|\n|\r)/gm, ' ');
         if (isAttachment && parentReportActionMessage) {
             return `[${Localize.translateLocal('common.attachment')}]`;
@@ -1617,6 +1750,11 @@ function getReportName(report, policy = undefined) {
         }
         return parentReportActionMessage || Localize.translateLocal('parentReportAction.deletedMessage');
     }
+
+    if (isTaskReport(report) && isCanceledTaskReport(report, parentReportAction)) {
+        return Localize.translateLocal('parentReportAction.deletedTask');
+    }
+
     if (isChatRoom(report) || isTaskReport(report)) {
         formattedName = report.reportName;
     }
@@ -1727,14 +1865,14 @@ function navigateToDetailsPage(report) {
     const participantAccountIDs = lodashGet(report, 'participantAccountIDs', []);
 
     if (isChatRoom(report) || isPolicyExpenseChat(report) || isChatThread(report) || isTaskReport(report)) {
-        Navigation.navigate(ROUTES.getReportDetailsRoute(report.reportID));
+        Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report.reportID));
         return;
     }
     if (participantAccountIDs.length === 1) {
-        Navigation.navigate(ROUTES.getProfileRoute(participantAccountIDs[0]));
+        Navigation.navigate(ROUTES.PROFILE.getRoute(participantAccountIDs[0]));
         return;
     }
-    Navigation.navigate(ROUTES.getReportParticipantsRoute(report.reportID));
+    Navigation.navigate(ROUTES.REPORT_PARTICIPANTS.getRoute(report.reportID));
 }
 
 /**
@@ -1760,7 +1898,7 @@ function hasReportNameError(report) {
 }
 
 /**
- * For comments shorter than 10k chars, convert the comment from MD into HTML because that's how it is stored in the database
+ * For comments shorter than or equal to 10k chars, convert the comment from MD into HTML because that's how it is stored in the database
  * For longer comments, skip parsing, but still escape the text, and display plaintext for performance reasons. It takes over 40s to parse a 100k long string!!
  *
  * @param {String} text
@@ -1768,7 +1906,7 @@ function hasReportNameError(report) {
  */
 function getParsedComment(text) {
     const parser = new ExpensiMark();
-    return text.length < CONST.MAX_MARKUP_LENGTH ? parser.replace(text) : _.escape(text);
+    return text.length <= CONST.MAX_MARKUP_LENGTH ? parser.replace(text) : _.escape(text);
 }
 
 /**
@@ -1951,6 +2089,7 @@ function buildOptimisticIOUReport(payeeAccountID, payerAccountID, total, chatRep
 
         // We don't translate reportName because the server response is always in English
         reportName: `${payerEmail} owes ${formattedTotal}`,
+        parentReportID: chatReportID,
     };
 }
 
@@ -1988,6 +2127,7 @@ function buildOptimisticExpenseReport(chatReportID, policyID, payeeAccountID, to
         state: CONST.REPORT.STATE.SUBMITTED,
         stateNum: CONST.REPORT.STATE_NUM.PROCESSING,
         total: storedTotal,
+        parentReportID: chatReportID,
     };
 }
 
@@ -1997,7 +2137,7 @@ function buildOptimisticExpenseReport(chatReportID, policyID, payeeAccountID, to
  * @param {Number} total - IOU total in cents
  * @param {String} comment - IOU comment
  * @param {String} currency - IOU currency
- * @param {String} paymentType - IOU paymentMethodType. Can be oneOf(Elsewhere, Expensify, PayPal.me)
+ * @param {String} paymentType - IOU paymentMethodType. Can be oneOf(Elsewhere, Expensify)
  * @param {Boolean} isSettlingUp - Whether we are settling up an IOU
  * @returns {Array}
  */
@@ -2009,14 +2149,12 @@ function getIOUReportActionMessage(iouReportID, type, total, comment, currency,
 
     let paymentMethodMessage;
     switch (paymentType) {
-        case CONST.IOU.PAYMENT_TYPE.ELSEWHERE:
-            paymentMethodMessage = ' elsewhere';
-            break;
         case CONST.IOU.PAYMENT_TYPE.VBBA:
-            paymentMethodMessage = ' using Expensify';
+        case CONST.IOU.PAYMENT_TYPE.EXPENSIFY:
+            paymentMethodMessage = ' with Expensify';
             break;
         default:
-            paymentMethodMessage = ` using ${paymentType}`;
+            paymentMethodMessage = ` elsewhere`;
             break;
     }
 
@@ -2060,7 +2198,7 @@ function getIOUReportActionMessage(iouReportID, type, total, comment, currency,
  * @param {String} comment - User comment for the IOU.
  * @param {Array}  participants - An array with participants details.
  * @param {String} [transactionID] - Not required if the IOUReportAction type is 'pay'
- * @param {String} [paymentType] - Only required if the IOUReportAction type is 'pay'. Can be oneOf(elsewhere, payPal, Expensify).
+ * @param {String} [paymentType] - Only required if the IOUReportAction type is 'pay'. Can be oneOf(elsewhere, Expensify).
  * @param {String} [iouReportID] - Only required if the IOUReportActions type is oneOf(decline, cancel, pay). Generates a randomID as default.
  * @param {Boolean} [isSettlingUp] - Whether we are settling up an IOU.
  * @param {Boolean} [isSendMoneyFlow] - Whether this is send money flow
@@ -2141,7 +2279,7 @@ function buildOptimisticIOUReportAction(
         created: DateUtils.getDBTime(),
         pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
         receipt,
-        whisperedToAccountIDs: !_.isEmpty(receipt) ? [currentUserAccountID] : [],
+        whisperedToAccountIDs: _.contains([CONST.IOU.RECEIPT_STATE.SCANREADY, CONST.IOU.RECEIPT_STATE.SCANNING], receipt.state) ? [currentUserAccountID] : [],
     };
 }
 /**
@@ -2194,6 +2332,7 @@ function buildOptimisticApprovedReportAction(amount, currency, expenseReportID)
  */
 function buildOptimisticReportPreview(chatReport, iouReport, comment = '', transaction = undefined) {
     const hasReceipt = TransactionUtils.hasReceipt(transaction);
+    const isReceiptBeingScanned = hasReceipt && TransactionUtils.isReceiptBeingScanned(transaction);
     const message = getReportPreviewMessage(iouReport);
     return {
         reportActionID: NumberUtils.rand64(),
@@ -2218,7 +2357,7 @@ function buildOptimisticReportPreview(chatReport, iouReport, comment = '', trans
         childMoneyRequestCount: 1,
         childLastMoneyRequestComment: comment,
         childLastReceiptTransactionIDs: hasReceipt ? transaction.transactionID : '',
-        whisperedToAccountIDs: hasReceipt ? [currentUserAccountID] : [],
+        whisperedToAccountIDs: isReceiptBeingScanned ? [currentUserAccountID] : [],
     };
 }
 
@@ -2268,12 +2407,13 @@ function buildOptimisticModifiedExpenseReportAction(transactionThread, oldTransa
  *
  * @param {Object} iouReport
  * @param {Object} reportPreviewAction
+ * @param {Boolean} isPayRequest
  * @param {String} [comment] - User comment for the IOU.
  * @param {Object} [transaction] - optimistic newest transaction of a report preview
  *
  * @returns {Object}
  */
-function updateReportPreview(iouReport, reportPreviewAction, comment = '', transaction = undefined) {
+function updateReportPreview(iouReport, reportPreviewAction, isPayRequest = false, comment = '', transaction = undefined) {
     const hasReceipt = TransactionUtils.hasReceipt(transaction);
     const lastReceiptTransactionIDs = lodashGet(reportPreviewAction, 'childLastReceiptTransactionIDs', '');
     const previousTransactionIDs = lastReceiptTransactionIDs.split(',').slice(0, 2);
@@ -2291,7 +2431,7 @@ function updateReportPreview(iouReport, reportPreviewAction, comment = '', trans
             },
         ],
         childLastMoneyRequestComment: comment || reportPreviewAction.childLastMoneyRequestComment,
-        childMoneyRequestCount: reportPreviewAction.childMoneyRequestCount + 1,
+        childMoneyRequestCount: reportPreviewAction.childMoneyRequestCount + (isPayRequest ? 0 : 1),
         childLastReceiptTransactionIDs: hasReceipt ? [transaction.transactionID, ...previousTransactionIDs].join(',') : lastReceiptTransactionIDs,
         // As soon as we add a transaction without a receipt to the report, it will have ready money requests,
         // so we remove the whisper
@@ -2411,7 +2551,7 @@ function buildOptimisticCreatedReportAction(emailCreatingAction) {
             {
                 type: CONST.REPORT.MESSAGE.TYPE.TEXT,
                 style: 'strong',
-                text: emailCreatingAction === currentUserEmail ? 'You' : emailCreatingAction,
+                text: emailCreatingAction,
             },
             {
                 type: CONST.REPORT.MESSAGE.TYPE.TEXT,
@@ -2450,7 +2590,7 @@ function buildOptimisticEditedTaskReportAction(emailEditingTask) {
             {
                 type: CONST.REPORT.MESSAGE.TYPE.TEXT,
                 style: 'strong',
-                text: emailEditingTask === currentUserEmail ? 'You' : emailEditingTask,
+                text: emailEditingTask,
             },
             {
                 type: CONST.REPORT.MESSAGE.TYPE.TEXT,
@@ -2491,7 +2631,7 @@ function buildOptimisticClosedReportAction(emailClosingReport, policyName, reaso
             {
                 type: CONST.REPORT.MESSAGE.TYPE.TEXT,
                 style: 'strong',
-                text: emailClosingReport === currentUserEmail ? 'You' : emailClosingReport,
+                text: emailClosingReport,
             },
             {
                 type: CONST.REPORT.MESSAGE.TYPE.TEXT,
@@ -2588,11 +2728,12 @@ function buildOptimisticWorkspaceChats(policyID, policyName) {
  * @param {String} parentReportID - Report ID of the chat where the Task is.
  * @param {String} title - Task title.
  * @param {String} description - Task description.
+ * @param {String} policyID - PolicyID of the parent report
  *
  * @returns {Object}
  */
 
-function buildOptimisticTaskReport(ownerAccountID, assigneeAccountID = 0, parentReportID, title, description) {
+function buildOptimisticTaskReport(ownerAccountID, assigneeAccountID = 0, parentReportID, title, description, policyID = CONST.POLICY.OWNER_EMAIL_FAKE) {
     return {
         reportID: generateReportID(),
         reportName: title,
@@ -2602,6 +2743,7 @@ function buildOptimisticTaskReport(ownerAccountID, assigneeAccountID = 0, parent
         managerID: assigneeAccountID,
         type: CONST.REPORT.TYPE.TASK,
         parentReportID,
+        policyID,
         stateNum: CONST.REPORT.STATE_NUM.OPEN,
         statusNum: CONST.REPORT.STATUS.OPEN,
     };
@@ -2622,7 +2764,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,
         '',
@@ -2767,6 +2909,18 @@ function canAccessReport(report, policies, betas, allReportActions) {
 
     return true;
 }
+/**
+ * Check if the report is the parent report of the currently viewed report or at least one child report has report action
+ * @param {Object} report
+ * @param {String} currentReportId
+ * @returns {Boolean}
+ */
+function shouldHideReport(report, currentReportId) {
+    const parentReport = getParentReport(getReport(currentReportId));
+    const reportActions = ReportActionsUtils.getAllReportActions(report.reportID);
+    const isChildReportHasComment = _.some(reportActions, (reportAction) => (reportAction.childVisibleActionCount || 0) > 0);
+    return parentReport.reportID !== report.reportID && !isChildReportHasComment;
+}
 
 /**
  * Takes several pieces of data from Onyx and evaluates if a report should be shown in the option list (either when searching
@@ -2794,7 +2948,13 @@ function shouldReportBeInOptionList(report, currentReportId, isInGSDMode, betas,
         !report ||
         !report.reportID ||
         report.isHidden ||
-        (_.isEmpty(report.participantAccountIDs) && !isChatThread(report) && !isPublicRoom(report) && !isArchivedRoom(report) && !isMoneyRequestReport(report) && !isTaskReport(report))
+        (report.participantAccountIDs &&
+            report.participantAccountIDs.length === 0 &&
+            !isChatThread(report) &&
+            !isPublicRoom(report) &&
+            !isArchivedRoom(report) &&
+            !isMoneyRequestReport(report) &&
+            !isTaskReport(report))
     ) {
         return false;
     }
@@ -2814,14 +2974,9 @@ function shouldReportBeInOptionList(report, currentReportId, isInGSDMode, betas,
     if (report.hasDraft || isWaitingForIOUActionFromCurrentUser(report) || isWaitingForTaskCompleteFromAssignee(report)) {
         return true;
     }
-
     const lastVisibleMessage = ReportActionsUtils.getLastVisibleMessage(report.reportID);
-    const isEmptyChat = !lastVisibleMessage.lastMessageText && !lastVisibleMessage.lastMessageTranslationKey;
-
-    // Hide only chat threads that haven't been commented on (other threads are actionable)
-    if (isChatThread(report) && isEmptyChat) {
-        return false;
-    }
+    const isEmptyChat = !report.lastMessageText && !report.lastMessageTranslationKey && !lastVisibleMessage.lastMessageText && !lastVisibleMessage.lastMessageTranslationKey;
+    const canHideReport = shouldHideReport(report, currentReportId);
 
     // Include reports if they are pinned
     if (report.isPinned) {
@@ -2830,7 +2985,7 @@ function shouldReportBeInOptionList(report, currentReportId, isInGSDMode, betas,
 
     // Include reports that have errors from trying to add a workspace
     // If we excluded it, then the red-brock-road pattern wouldn't work for the user to resolve the error
-    if (report.errorFields && !_.isEmpty(report.errorFields.addWorkspaceRoom)) {
+    if (report.errorFields && report.errorFields.addWorkspaceRoom) {
         return true;
     }
 
@@ -2845,7 +3000,7 @@ function shouldReportBeInOptionList(report, currentReportId, isInGSDMode, betas,
     }
 
     // Hide chats between two users that haven't been commented on from the LNH
-    if (excludeEmptyChats && isEmptyChat && isChatReport(report) && !isChatRoom(report) && !isPolicyExpenseChat(report)) {
+    if (excludeEmptyChats && isEmptyChat && isChatReport(report) && !isChatRoom(report) && !isPolicyExpenseChat(report) && canHideReport) {
         return false;
     }
 
@@ -2878,28 +3033,6 @@ function getChatByParticipants(newParticipantList) {
     });
 }
 
-/**
- * Attempts to find a report in onyx with the provided email list of participants. Does not include threads
- * This is temporary function while migrating from PersonalDetails to PersonalDetailsList
- *
- * @deprecated - use getChatByParticipants()
- *
- * @param {Array} participantsLoginList
- * @returns {Array|undefined}
- */
-function getChatByParticipantsByLoginList(participantsLoginList) {
-    participantsLoginList.sort();
-    return _.find(allReports, (report) => {
-        // If the report has been deleted, or there are no participants (like an empty #admins room) then skip it
-        if (!report || _.isEmpty(report.participantAccountIDs) || isThread(report)) {
-            return false;
-        }
-
-        // Only return the room if it has all the participants and is not a policy room
-        return !isUserCreatedPolicyRoom(report) && _.isEqual(participantsLoginList, _.sortBy(report.participants));
-    });
-}
-
 /**
  * Attempts to find a report in onyx with the provided list of participants in given policy
  * @param {Array} newParticipantList
@@ -3037,13 +3170,35 @@ function getRouteFromLink(url) {
     return route;
 }
 
+/**
+ * @param {String} route
+ * @returns {Object}
+ */
+function parseReportRouteParams(route) {
+    let parsingRoute = route;
+    if (parsingRoute.at(0) === '/') {
+        // remove the first slash
+        parsingRoute = parsingRoute.slice(1);
+    }
+
+    if (!parsingRoute.startsWith(Url.addTrailingForwardSlash('r'))) {
+        return {reportID: '', isSubReportPageRoute: false};
+    }
+
+    const pathSegments = parsingRoute.split('/');
+    return {
+        reportID: pathSegments[1],
+        isSubReportPageRoute: pathSegments.length > 2,
+    };
+}
+
 /**
  * @param {String|null} url
  * @returns {String}
  */
 function getReportIDFromLink(url) {
     const route = getRouteFromLink(url);
-    const {reportID, isSubReportPageRoute} = ROUTES.parseReportRouteParams(route);
+    const {reportID, isSubReportPageRoute} = parseReportRouteParams(route);
     if (isSubReportPageRoute) {
         // We allow the Sub-Report deep link routes (settings, details, etc.) to be handled by their respective component pages
         return '';
@@ -3104,8 +3259,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 [];
     }
 
@@ -3424,8 +3579,8 @@ function getTaskAssigneeChatOnyxData(accountID, assigneeEmail, assigneeAccountID
 
     // If you're choosing to share the task in the same DM as the assignee then we don't need to create another reportAction indicating that you've been assigned
     if (assigneeChatReportID !== parentReportID) {
-        optimisticAssigneeAddComment = buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeEmail, assigneeAccountID, `Assigned a task to you: ${title}`, parentReportID);
-
+        const displayname = lodashGet(allPersonalDetails, [assigneeAccountID, 'displayName']) || lodashGet(allPersonalDetails, [assigneeAccountID, 'login'], '');
+        optimisticAssigneeAddComment = buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeEmail, assigneeAccountID, `assigned to ${displayname}`, parentReportID);
         const lastAssigneeCommentText = formatReportLastMessageText(optimisticAssigneeAddComment.reportAction.message[0].text);
         const optimisticAssigneeReport = {
             lastVisibleActionCreated: currentTime,
@@ -3483,6 +3638,46 @@ function getReportPreviewDisplayTransactions(reportPreviewAction) {
     );
 }
 
+/**
+ * Return iou report action display message
+ *
+ * @param {Object} reportAction report action
+ * @returns {String}
+ */
+function getIOUReportActionDisplayMessage(reportAction) {
+    const originalMessage = _.get(reportAction, 'originalMessage', {});
+    let displayMessage;
+    if (originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY) {
+        const {amount, currency, IOUReportID} = originalMessage;
+        const formattedAmount = CurrencyUtils.convertToDisplayString(amount, currency);
+        const iouReport = getReport(IOUReportID);
+        const payerName = isExpenseReport(iouReport) ? getPolicyName(iouReport) : getDisplayNameForParticipant(iouReport.managerID);
+        let translationKey;
+        switch (originalMessage.paymentType) {
+            case CONST.IOU.PAYMENT_TYPE.ELSEWHERE:
+                translationKey = 'iou.paidElsewhereWithAmount';
+                break;
+            case CONST.IOU.PAYMENT_TYPE.EXPENSIFY:
+            case CONST.IOU.PAYMENT_TYPE.VBBA:
+                translationKey = 'iou.paidUsingExpensifyWithAmount';
+                break;
+            default:
+                translationKey = '';
+                break;
+        }
+        displayMessage = Localize.translateLocal(translationKey, {amount: formattedAmount, payer: payerName});
+    } else {
+        const transaction = TransactionUtils.getTransaction(originalMessage.IOUTransactionID);
+        const {amount, currency, comment} = getTransactionDetails(transaction);
+        const formattedAmount = CurrencyUtils.convertToDisplayString(amount, currency);
+        displayMessage = Localize.translateLocal('iou.requestedAmount', {
+            formattedAmount,
+            comment,
+        });
+    }
+    return displayMessage;
+}
+
 export {
     getReportParticipantsTitle,
     isReportMessageAttachment,
@@ -3555,7 +3750,6 @@ export {
     getOptimisticDataForParentReportAction,
     shouldReportBeInOptionList,
     getChatByParticipants,
-    getChatByParticipantsByLoginList,
     getChatByParticipantsAndPolicy,
     getAllPolicyReports,
     getIOUReportActionMessage,
@@ -3598,6 +3792,7 @@ export {
     isAllowedToComment,
     getBankAccountRoute,
     getParentReport,
+    getRootParentReport,
     getTaskParentReportActionIDInAssigneeReport,
     getReportPreviewMessage,
     getModifiedExpenseMessage,
@@ -3623,4 +3818,6 @@ export {
     getReportPreviewDisplayTransactions,
     getTransactionsWithReceipts,
     hasMissingSmartscanFields,
+    getIOUReportActionDisplayMessage,
+    isWaitingForTaskCompleteFromAssignee,
 };
diff --git a/src/libs/Request.js b/src/libs/Request.ts
similarity index 53%
rename from src/libs/Request.js
rename to src/libs/Request.ts
index 577dcf3cb85d..459deaf89e1e 100644
--- a/src/libs/Request.js
+++ b/src/libs/Request.ts
@@ -1,43 +1,29 @@
-import _ from 'underscore';
 import HttpUtils from './HttpUtils';
 import enhanceParameters from './Network/enhanceParameters';
 import * as NetworkStore from './Network/NetworkStore';
+import Request from '../types/onyx/Request';
 
-let middlewares = [];
+type Middleware = (response: unknown, request: Request, isFromSequentialQueue: boolean) => Promise<unknown>;
 
-/**
- * @param {Object} request
- * @param {String} request.command
- * @param {Object} request.data
- * @param {String} request.type
- * @param {Boolean} request.shouldUseSecure
- * @returns {Promise}
- */
-function makeXHR(request) {
-    const finalParameters = enhanceParameters(request.command, request.data);
+let middlewares: Middleware[] = [];
+
+function makeXHR(request: Request): Promise<unknown> {
+    const finalParameters = enhanceParameters(request.command, request?.data ?? {});
     return NetworkStore.hasReadRequiredDataFromStorage().then(() => {
         // If we're using the Supportal token and this is not a Supportal request
         // let's just return a promise that will resolve itself.
         if (NetworkStore.getSupportAuthToken() && !NetworkStore.isSupportRequest(request.command)) {
-            return new Promise((resolve) => resolve());
+            return new Promise<void>((resolve) => resolve());
         }
         return HttpUtils.xhr(request.command, finalParameters, request.type, request.shouldUseSecure);
     });
 }
 
-/**
- * @param {Object} request
- * @param {Boolean} [isFromSequentialQueue]
- * @returns {Promise}
- */
-function processWithMiddleware(request, isFromSequentialQueue = false) {
-    return _.reduce(middlewares, (last, middleware) => middleware(last, request, isFromSequentialQueue), makeXHR(request));
+function processWithMiddleware(request: Request, isFromSequentialQueue = false): Promise<unknown> {
+    return middlewares.reduce((last, middleware) => middleware(last, request, isFromSequentialQueue), makeXHR(request));
 }
 
-/**
- * @param {Function} middleware
- */
-function use(middleware) {
+function use(middleware: Middleware) {
     middlewares.push(middleware);
 }
 
diff --git a/src/libs/RequestThrottle.js b/src/libs/RequestThrottle.ts
similarity index 53%
rename from src/libs/RequestThrottle.js
rename to src/libs/RequestThrottle.ts
index 4725a3ad5c38..d6ccab91bf23 100644
--- a/src/libs/RequestThrottle.js
+++ b/src/libs/RequestThrottle.ts
@@ -1,5 +1,5 @@
-import _ from 'underscore';
 import CONST from '../CONST';
+import {generateRandomInt} from './NumberUtils';
 
 let requestWaitTime = 0;
 
@@ -7,23 +7,21 @@ function clear() {
     requestWaitTime = 0;
 }
 
-/**
- * @returns {Number} time to wait in ms
- */
 function getRequestWaitTime() {
     if (requestWaitTime) {
         requestWaitTime = Math.min(requestWaitTime * 2, CONST.NETWORK.MAX_RETRY_WAIT_TIME_MS);
     } else {
-        requestWaitTime = _.random(CONST.NETWORK.MIN_RETRY_WAIT_TIME_MS, CONST.NETWORK.MAX_RANDOM_RETRY_WAIT_TIME_MS);
+        requestWaitTime = generateRandomInt(CONST.NETWORK.MIN_RETRY_WAIT_TIME_MS, CONST.NETWORK.MAX_RANDOM_RETRY_WAIT_TIME_MS);
     }
     return requestWaitTime;
 }
 
-/**
- * @returns {Promise}
- */
-function sleep() {
+function getLastRequestWaitTime() {
+    return requestWaitTime;
+}
+
+function sleep(): Promise<void> {
     return new Promise((resolve) => setTimeout(resolve, getRequestWaitTime()));
 }
 
-export {clear, getRequestWaitTime, sleep};
+export {clear, getRequestWaitTime, sleep, getLastRequestWaitTime};
diff --git a/src/libs/SessionUtils.js b/src/libs/SessionUtils.ts
similarity index 79%
rename from src/libs/SessionUtils.js
rename to src/libs/SessionUtils.ts
index 7b1fc9f42d25..fcbc9a887fa9 100644
--- a/src/libs/SessionUtils.js
+++ b/src/libs/SessionUtils.ts
@@ -1,16 +1,10 @@
 import Onyx from 'react-native-onyx';
-import _ from 'underscore';
-import lodashGet from 'lodash/get';
 import ONYXKEYS from '../ONYXKEYS';
 
 /**
  * Determine if the transitioning user is logging in as a new user.
- *
- * @param {String} transitionURL
- * @param {String} sessionEmail
- * @returns {Boolean}
  */
-function isLoggingInAsNewUser(transitionURL, sessionEmail) {
+function isLoggingInAsNewUser(transitionURL: string, sessionEmail: string): boolean {
     // The OldDot mobile app does not URL encode the parameters, but OldDot web
     // does. We don't want to deploy OldDot mobile again, so as a work around we
     // compare the session email to both the decoded and raw email from the transition link.
@@ -27,22 +21,22 @@ function isLoggingInAsNewUser(transitionURL, sessionEmail) {
     // Capture the un-encoded text in the email param
     const emailParamRegex = /[?&]email=([^&]*)/g;
     const matches = emailParamRegex.exec(transitionURL);
-    const linkedEmail = lodashGet(matches, 1, null);
+    const linkedEmail = matches?.[1] ?? null;
     return linkedEmail !== sessionEmail;
 }
 
-let loggedInDuringSession;
+let loggedInDuringSession: boolean | undefined;
 
 // To tell if the user logged in during this session we will check the value of session.authToken once when the app's JS inits. When the user logs out
 // we can reset this flag so that it can be updated again.
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (session) => {
-        if (!_.isUndefined(loggedInDuringSession)) {
+        if (loggedInDuringSession) {
             return;
         }
 
-        if (session && session.authToken) {
+        if (session?.authToken) {
             loggedInDuringSession = false;
         } else {
             loggedInDuringSession = true;
@@ -54,9 +48,6 @@ function resetDidUserLogInDuringSession() {
     loggedInDuringSession = undefined;
 }
 
-/**
- * @returns {boolean}
- */
 function didUserLogInDuringSession() {
     return Boolean(loggedInDuringSession);
 }
diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js
index 118035f9f605..7a32db660021 100644
--- a/src/libs/SidebarUtils.js
+++ b/src/libs/SidebarUtils.js
@@ -1,7 +1,7 @@
+/* eslint-disable rulesdir/prefer-underscore-method */
 import Onyx from 'react-native-onyx';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
-import lodashOrderBy from 'lodash/orderBy';
 import Str from 'expensify-common/lib/str';
 import ONYXKEYS from '../ONYXKEYS';
 import * as ReportUtils from './ReportUtils';
@@ -71,10 +71,36 @@ function isSidebarLoadedReady() {
     return sidebarIsReadyPromise;
 }
 
+function compareStringDates(stringA, stringB) {
+    if (stringA < stringB) {
+        return -1;
+    }
+    if (stringA > stringB) {
+        return 1;
+    }
+    return 0;
+}
+
 function setIsSidebarLoadedReady() {
     resolveSidebarIsReadyPromise();
 }
 
+// Define a cache object to store the memoized results
+const reportIDsCache = new Map();
+
+// Function to set a key-value pair while maintaining the maximum key limit
+function setWithLimit(map, key, value) {
+    if (map.size >= 5) {
+        // If the map has reached its limit, remove the first (oldest) key-value pair
+        const firstKey = map.keys().next().value;
+        map.delete(firstKey);
+    }
+    map.set(key, value);
+}
+
+// Variable to verify if ONYX actions are loaded
+let hasInitialReportActions = false;
+
 /**
  * @param {String} currentReportId
  * @param {Object} allReportsDict
@@ -85,22 +111,46 @@ function setIsSidebarLoadedReady() {
  * @returns {String[]} An array of reportIDs sorted in the proper order
  */
 function getOrderedReportIDs(currentReportId, allReportsDict, betas, policies, priorityMode, allReportActions) {
+    // Generate a unique cache key based on the function arguments
+    const cachedReportsKey = JSON.stringify(
+        // eslint-disable-next-line es/no-optional-chaining
+        [currentReportId, allReportsDict, betas, policies, priorityMode, allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${currentReportId}`]?.length || 1],
+        (key, value) => {
+            /**
+             *  Exclude 'participantAccountIDs', 'participants' and 'lastMessageText' not to overwhelm a cached key value with huge data,
+             *  which we don't need to store in a cacheKey
+             */
+            if (key === 'participantAccountIDs' || key === 'participants' || key === 'lastMessageText') {
+                return undefined;
+            }
+            return value;
+        },
+    );
+
+    // Check if the result is already in the cache
+    if (reportIDsCache.has(cachedReportsKey) && hasInitialReportActions) {
+        return reportIDsCache.get(cachedReportsKey);
+    }
+
+    // This is needed to prevent caching when Onyx is empty for a second render
+    hasInitialReportActions = Object.values(lastReportActions).length > 0;
+
     const isInGSDMode = priorityMode === CONST.PRIORITY_MODE.GSD;
     const isInDefaultMode = !isInGSDMode;
-
+    const allReportsDictValues = Object.values(allReportsDict);
     // Filter out all the reports that shouldn't be displayed
-    const reportsToDisplay = _.filter(allReportsDict, (report) => ReportUtils.shouldReportBeInOptionList(report, currentReportId, isInGSDMode, betas, policies, allReportActions, true));
+    const reportsToDisplay = allReportsDictValues.filter((report) => ReportUtils.shouldReportBeInOptionList(report, currentReportId, isInGSDMode, betas, policies, allReportActions, true));
 
-    if (_.isEmpty(reportsToDisplay)) {
+    if (reportsToDisplay.length === 0) {
         // Display Concierge chat report when there is no report to be displayed
-        const conciergeChatReport = _.find(allReportsDict, ReportUtils.isConciergeChatReport);
+        const conciergeChatReport = allReportsDictValues.find(ReportUtils.isConciergeChatReport);
         if (conciergeChatReport) {
             reportsToDisplay.push(conciergeChatReport);
         }
     }
 
     // There are a few properties that need to be calculated for the report which are used when sorting reports.
-    _.each(reportsToDisplay, (report) => {
+    reportsToDisplay.forEach((report) => {
         // Normally, the spread operator would be used here to clone the report and prevent the need to reassign the params.
         // However, this code needs to be very performant to handle thousands of reports, so in the interest of speed, we're just going to disable this lint rule and add
         // the reportDisplayName property to the report object directly.
@@ -121,52 +171,46 @@ function getOrderedReportIDs(currentReportId, allReportsDict, betas, policies, p
     // 5. Archived reports
     //      - Sorted by lastVisibleActionCreated in default (most recent) view mode
     //      - Sorted by reportDisplayName in GSD (focus) view mode
-    let pinnedReports = [];
-    let outstandingIOUReports = [];
-    let draftReports = [];
-    let nonArchivedReports = [];
-    let archivedReports = [];
-    _.each(reportsToDisplay, (report) => {
+    const pinnedReports = [];
+    const outstandingIOUReports = [];
+    const draftReports = [];
+    const nonArchivedReports = [];
+    const archivedReports = [];
+    reportsToDisplay.forEach((report) => {
         if (report.isPinned) {
             pinnedReports.push(report);
-            return;
-        }
-
-        if (ReportUtils.isWaitingForIOUActionFromCurrentUser(report)) {
+        } else if (ReportUtils.isWaitingForIOUActionFromCurrentUser(report)) {
             outstandingIOUReports.push(report);
-            return;
-        }
-
-        if (report.hasDraft) {
+        } else if (report.hasDraft) {
             draftReports.push(report);
-            return;
-        }
-
-        if (ReportUtils.isArchivedRoom(report)) {
+        } else if (ReportUtils.isArchivedRoom(report)) {
             archivedReports.push(report);
-            return;
+        } else {
+            nonArchivedReports.push(report);
         }
-
-        nonArchivedReports.push(report);
     });
 
     // Sort each group of reports accordingly
-    pinnedReports = _.sortBy(pinnedReports, (report) => report.displayName.toLowerCase());
-    outstandingIOUReports = lodashOrderBy(outstandingIOUReports, ['iouReportAmount', (report) => report.displayName.toLowerCase()], ['desc', 'asc']);
-    draftReports = _.sortBy(draftReports, (report) => report.displayName.toLowerCase());
-    nonArchivedReports = isInDefaultMode
-        ? lodashOrderBy(nonArchivedReports, ['lastVisibleActionCreated', (report) => report.displayName.toLowerCase()], ['desc', 'asc'])
-        : lodashOrderBy(nonArchivedReports, [(report) => report.displayName.toLowerCase()], ['asc']);
-    archivedReports = _.sortBy(archivedReports, (report) => (isInDefaultMode ? report.lastVisibleActionCreated : report.displayName.toLowerCase()));
-
-    // For archived reports ensure that most recent reports are at the top by reversing the order of the arrays because underscore will only sort them in ascending order
+    pinnedReports.sort((a, b) => a.displayName.toLowerCase().localeCompare(b.displayName.toLowerCase()));
+    outstandingIOUReports.sort((a, b) => b.iouReportAmount - a.iouReportAmount || a.displayName.toLowerCase().localeCompare(b.displayName.toLowerCase()));
+    draftReports.sort((a, b) => a.displayName.toLowerCase().localeCompare(b.displayName.toLowerCase()));
+
     if (isInDefaultMode) {
-        archivedReports.reverse();
+        nonArchivedReports.sort(
+            (a, b) => compareStringDates(b.lastVisibleActionCreated, a.lastVisibleActionCreated) || a.displayName.toLowerCase().localeCompare(b.displayName.toLowerCase()),
+        );
+        // For archived reports ensure that most recent reports are at the top by reversing the order
+        archivedReports.sort((a, b) => compareStringDates(b.lastVisibleActionCreated, a.lastVisibleActionCreated));
+    } else {
+        nonArchivedReports.sort((a, b) => a.displayName.toLowerCase().localeCompare(b.displayName.toLowerCase()));
+        archivedReports.sort((a, b) => a.displayName.toLowerCase().localeCompare(b.displayName.toLowerCase()));
     }
 
     // Now that we have all the reports grouped and sorted, they must be flattened into an array and only return the reportID.
     // The order the arrays are concatenated in matters and will determine the order that the groups are displayed in the sidebar.
-    return _.pluck([].concat(pinnedReports).concat(outstandingIOUReports).concat(draftReports).concat(nonArchivedReports).concat(archivedReports), 'reportID');
+    const LHNReports = [].concat(pinnedReports, outstandingIOUReports, draftReports, nonArchivedReports, archivedReports).map((report) => report.reportID);
+    setWithLimit(reportIDsCache, cachedReportsKey, LHNReports);
+    return LHNReports;
 }
 
 /**
@@ -177,9 +221,10 @@ function getOrderedReportIDs(currentReportId, allReportsDict, betas, policies, p
  * @param {Object} personalDetails
  * @param {String} preferredLocale
  * @param {Object} [policy]
+ * @param {Object} parentReportAction
  * @returns {Object}
  */
-function getOptionData(report, reportActions, personalDetails, preferredLocale, policy) {
+function getOptionData(report, reportActions, personalDetails, preferredLocale, policy, parentReportAction) {
     // When a user signs out, Onyx is cleared. Due to the lazy rendering with a virtual list, it's possible for
     // this method to be called after the Onyx data has been cleared out. In that case, it's fine to do
     // a null check here and return early.
@@ -205,7 +250,6 @@ function getOptionData(report, reportActions, personalDetails, preferredLocale,
         statusNum: null,
         stateNum: null,
         phoneNumber: null,
-        payPalMeAddress: null,
         isUnread: null,
         isUnreadWithMention: null,
         hasDraftComment: false,
@@ -234,8 +278,7 @@ function getOptionData(report, reportActions, personalDetails, preferredLocale,
     result.isChatRoom = ReportUtils.isChatRoom(report);
     result.isTaskReport = ReportUtils.isTaskReport(report);
     if (result.isTaskReport) {
-        result.isCompletedTaskReport = ReportUtils.isCompletedTaskReport(report);
-        result.isTaskAssignee = ReportUtils.isReportManager(report);
+        result.isWaitingForTaskCompleteFromAssignee = ReportUtils.isWaitingForTaskCompleteFromAssignee(report, parentReportAction);
     }
     result.isArchivedRoom = ReportUtils.isArchivedRoom(report);
     result.isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
@@ -288,9 +331,9 @@ function getOptionData(report, reportActions, personalDetails, preferredLocale,
               }
             : null;
     }
-    let lastMessageText =
-        hasMultipleParticipants && lastActorDetails && lastActorDetails.accountID && Number(lastActorDetails.accountID) !== currentUserAccountID ? `${lastActorDetails.displayName}: ` : '';
-    lastMessageText += report ? lastMessageTextFromReport : '';
+    const lastActorDisplayName =
+        hasMultipleParticipants && lastActorDetails && lastActorDetails.accountID && Number(lastActorDetails.accountID) !== currentUserAccountID ? lastActorDetails.displayName : '';
+    let lastMessageText = lastMessageTextFromReport;
 
     if (result.isArchivedRoom) {
         const archiveReason =
@@ -308,9 +351,11 @@ function getOptionData(report, reportActions, personalDetails, preferredLocale,
             const newName = lodashGet(lastAction, 'originalMessage.newName', '');
             result.alternateText = Localize.translate(preferredLocale, 'newRoomPage.roomRenamedTo', {newName});
         } else if (lodashGet(lastAction, 'actionName', '') === CONST.REPORT.ACTIONS.TYPE.TASKREOPENED) {
-            result.alternateText = `${Localize.translate(preferredLocale, 'task.messages.reopened')}: ${report.reportName}`;
+            result.alternateText = `${Localize.translate(preferredLocale, 'task.messages.reopened')}`;
         } else if (lodashGet(lastAction, 'actionName', '') === CONST.REPORT.ACTIONS.TYPE.TASKCOMPLETED) {
-            result.alternateText = `${Localize.translate(preferredLocale, 'task.messages.completed')}: ${report.reportName}`;
+            result.alternateText = `${Localize.translate(preferredLocale, 'task.messages.completed')}`;
+        } else if (lodashGet(lastAction, 'actionName', '') !== CONST.REPORT.ACTIONS.TYPE.REPORTPREVIEW && lastActorDisplayName && lastMessageTextFromReport) {
+            result.alternateText = `${lastActorDisplayName}: ${lastMessageText}`;
         } else {
             result.alternateText = lastMessageTextFromReport.length > 0 ? lastMessageText : Localize.translate(preferredLocale, 'report.noActivityYet');
         }
@@ -345,7 +390,6 @@ function getOptionData(report, reportActions, personalDetails, preferredLocale,
         result.accountID = personalDetail.accountID;
         result.login = personalDetail.login;
         result.phoneNumber = personalDetail.phoneNumber;
-        result.payPalMeAddress = personalDetail.payPalMeAddress;
     }
 
     const reportName = ReportUtils.getReportName(report, policy);
@@ -354,7 +398,7 @@ function getOptionData(report, reportActions, personalDetails, preferredLocale,
     result.subtitle = subtitle;
     result.participantsList = participantPersonalDetailList;
 
-    result.icons = ReportUtils.getIcons(report, personalDetails, UserUtils.getAvatar(personalDetail.avatar, personalDetail.accountID), true, '', -1, policy);
+    result.icons = ReportUtils.getIcons(report, personalDetails, UserUtils.getAvatar(personalDetail.avatar, personalDetail.accountID), '', -1, policy);
     result.searchText = OptionsListUtils.getSearchText(report, reportName, participantPersonalDetailList, result.isChatRoom || result.isPolicyExpenseChat, result.isThread);
     result.displayNamesWithTooltips = displayNamesWithTooltips;
     result.isLastMessageDeletedParentAction = report.isLastMessageDeletedParentAction;
diff --git a/src/libs/StartupTimer/index.js b/src/libs/StartupTimer/index.js
deleted file mode 100644
index 7b53266e50d9..000000000000
--- a/src/libs/StartupTimer/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Web noop as there is no "startup" to time from the native layer.
- */
-
-export default {
-    stop() {},
-};
diff --git a/src/libs/StartupTimer/index.native.js b/src/libs/StartupTimer/index.native.js
deleted file mode 100644
index 29bbef8cfe3d..000000000000
--- a/src/libs/StartupTimer/index.native.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import {NativeModules} from 'react-native';
-
-/**
- * Stop the startup trace for the app.
- */
-function stop() {
-    NativeModules.StartupTimer.stop();
-}
-
-export default {
-    stop,
-};
diff --git a/src/libs/StartupTimer/index.native.ts b/src/libs/StartupTimer/index.native.ts
new file mode 100644
index 000000000000..52ba55076fc1
--- /dev/null
+++ b/src/libs/StartupTimer/index.native.ts
@@ -0,0 +1,13 @@
+import {NativeModules} from 'react-native';
+import StartupTimer from './types';
+
+/**
+ * Stop the startup trace for the app.
+ */
+const startupTimer: StartupTimer = {
+    stop: () => {
+        NativeModules.StartupTimer.stop();
+    },
+};
+
+export default startupTimer;
diff --git a/src/libs/StartupTimer/index.ts b/src/libs/StartupTimer/index.ts
new file mode 100644
index 000000000000..421524a70fc8
--- /dev/null
+++ b/src/libs/StartupTimer/index.ts
@@ -0,0 +1,11 @@
+/**
+ * Web noop as there is no "startup" to time from the native layer.
+ */
+
+import StartupTimer from './types';
+
+const startupTimer: StartupTimer = {
+    stop: () => {},
+};
+
+export default startupTimer;
diff --git a/src/libs/StartupTimer/types.ts b/src/libs/StartupTimer/types.ts
new file mode 100644
index 000000000000..e382fc267933
--- /dev/null
+++ b/src/libs/StartupTimer/types.ts
@@ -0,0 +1,5 @@
+type StartupTimer = {
+    stop: () => void;
+};
+
+export default StartupTimer;
diff --git a/src/libs/StatusBar/index.android.js b/src/libs/StatusBar/index.android.ts
similarity index 74%
rename from src/libs/StatusBar/index.android.js
rename to src/libs/StatusBar/index.android.ts
index 5033000d4de5..c928f0949665 100644
--- a/src/libs/StatusBar/index.android.js
+++ b/src/libs/StatusBar/index.android.ts
@@ -1,5 +1,4 @@
-// eslint-disable-next-line no-restricted-imports
-import {StatusBar} from 'react-native';
+import StatusBar from './types';
 
 // Only has custom web implementation
 StatusBar.getBackgroundColor = () => null;
@@ -8,5 +7,4 @@ StatusBar.getBackgroundColor = () => null;
 // Also because Reanimated's interpolateColor gives Android native colors instead of hex strings, causing this to display a warning.
 StatusBar.setBackgroundColor = () => null;
 
-// Just export StatusBar – no changes.
 export default StatusBar;
diff --git a/src/libs/StatusBar/index.js b/src/libs/StatusBar/index.ts
similarity index 74%
rename from src/libs/StatusBar/index.js
rename to src/libs/StatusBar/index.ts
index ef15d597f93e..c1290bccaa77 100644
--- a/src/libs/StatusBar/index.js
+++ b/src/libs/StatusBar/index.ts
@@ -1,5 +1,4 @@
-// eslint-disable-next-line no-restricted-imports
-import {StatusBar} from 'react-native';
+import StatusBar from './types';
 
 // Only has custom web implementation
 StatusBar.getBackgroundColor = () => null;
diff --git a/src/libs/StatusBar/index.web.js b/src/libs/StatusBar/index.web.js
deleted file mode 100644
index dfa1226c33a8..000000000000
--- a/src/libs/StatusBar/index.web.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import {StatusBar} from 'react-native';
-
-StatusBar.getBackgroundColor = () => {
-    const element = document.querySelector('meta[name=theme-color]');
-    if (!element || !element.content) {
-        return null;
-    }
-    return element.content;
-};
-
-StatusBar.setBackgroundColor = (backgroundColor) => {
-    const element = document.querySelector('meta[name=theme-color]');
-    if (!element) {
-        return;
-    }
-    element.content = backgroundColor;
-};
-
-export default StatusBar;
diff --git a/src/libs/StatusBar/index.web.ts b/src/libs/StatusBar/index.web.ts
new file mode 100644
index 000000000000..1d46397eb4b7
--- /dev/null
+++ b/src/libs/StatusBar/index.web.ts
@@ -0,0 +1,23 @@
+import StatusBar from './types';
+
+StatusBar.getBackgroundColor = () => {
+    const element = document.querySelector<HTMLMetaElement>('meta[name=theme-color]');
+
+    if (!element?.content) {
+        return null;
+    }
+
+    return element.content;
+};
+
+StatusBar.setBackgroundColor = (backgroundColor) => {
+    const element = document.querySelector<HTMLMetaElement>('meta[name=theme-color]');
+
+    if (!element) {
+        return;
+    }
+
+    element.content = backgroundColor as string;
+};
+
+export default StatusBar;
diff --git a/src/libs/StatusBar/types.ts b/src/libs/StatusBar/types.ts
new file mode 100644
index 000000000000..9098eed977ab
--- /dev/null
+++ b/src/libs/StatusBar/types.ts
@@ -0,0 +1,10 @@
+// eslint-disable-next-line no-restricted-imports
+import {StatusBar as StatusBarRN} from 'react-native';
+
+type StatusBarExtended = typeof StatusBarRN & {
+    getBackgroundColor(): string | null;
+};
+
+const StatusBar = StatusBarRN as StatusBarExtended;
+
+export default StatusBar;
diff --git a/src/libs/StringUtils.js b/src/libs/StringUtils.js
deleted file mode 100644
index 8219f9e8077f..000000000000
--- a/src/libs/StringUtils.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import _ from 'lodash';
-import CONST from '../CONST';
-/**
- * Removes diacritical marks and non-alphabetic and non-latin characters from a string.
- * @param {String} str - The input string to be sanitized.
- * @returns {String} The sanitized string
- */
-function sanitizeString(str) {
-    return _.chain(str).deburr().toLower().value().replaceAll(CONST.REGEX.NON_ALPHABETIC_AND_NON_LATIN_CHARS, '');
-}
-
-export default {sanitizeString};
diff --git a/src/libs/StringUtils.ts b/src/libs/StringUtils.ts
new file mode 100644
index 000000000000..8ef23bb0751b
--- /dev/null
+++ b/src/libs/StringUtils.ts
@@ -0,0 +1,13 @@
+import _ from 'lodash';
+import CONST from '../CONST';
+
+/**
+ * Removes diacritical marks and non-alphabetic and non-latin characters from a string.
+ * @param str - The input string to be sanitized.
+ * @returns The sanitized string
+ */
+function sanitizeString(str: string): string {
+    return _.deburr(str).toLowerCase().replaceAll(CONST.REGEX.NON_ALPHABETIC_AND_NON_LATIN_CHARS, '');
+}
+
+export default {sanitizeString};
diff --git a/src/libs/TransactionUtils.js b/src/libs/TransactionUtils.js
index 16deefef3a00..aff1068546d1 100644
--- a/src/libs/TransactionUtils.js
+++ b/src/libs/TransactionUtils.js
@@ -33,6 +33,9 @@ Onyx.connect({
  * @param {Object} [receipt]
  * @param {String} [filename]
  * @param {String} [existingTransactionID] When creating a distance request, an empty transaction has already been created with a transactionID. In that case, the transaction here needs to have it's transactionID match what was already generated.
+ * @param {String} [category]
+ * @param {String} [tag]
+ * @param {Boolean} [billable]
  * @returns {Object}
  */
 function buildOptimisticTransaction(
@@ -47,6 +50,9 @@ function buildOptimisticTransaction(
     receipt = {},
     filename = '',
     existingTransactionID = null,
+    category = '',
+    tag = '',
+    billable = false,
 ) {
     // transactionIDs are random, positive, 64-bit numeric strings.
     // Because JS can only handle 53-bit numbers, transactionIDs are strings in the front-end (just like reportActionID)
@@ -74,6 +80,9 @@ function buildOptimisticTransaction(
         pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
         receipt,
         filename,
+        category,
+        tag,
+        billable,
     };
 }
 
@@ -138,6 +147,23 @@ function getUpdatedTransaction(transaction, transactionChanges, isFromExpenseRep
         shouldStopSmartscan = true;
     }
 
+    if (_.has(transactionChanges, 'waypoints')) {
+        updatedTransaction.modifiedWaypoints = transactionChanges.waypoints;
+        shouldStopSmartscan = true;
+    }
+
+    if (_.has(transactionChanges, 'billable')) {
+        updatedTransaction.billable = transactionChanges.billable;
+    }
+
+    if (_.has(transactionChanges, 'category')) {
+        updatedTransaction.category = transactionChanges.category;
+    }
+
+    if (_.has(transactionChanges, 'tag')) {
+        updatedTransaction.tag = transactionChanges.tag;
+    }
+
     if (shouldStopSmartscan && _.has(transaction, 'receipt') && !_.isEmpty(transaction.receipt) && lodashGet(transaction, 'receipt.state') !== CONST.IOU.RECEIPT_STATE.OPEN) {
         updatedTransaction.receipt.state = CONST.IOU.RECEIPT_STATE.OPEN;
     }
@@ -148,6 +174,10 @@ function getUpdatedTransaction(transaction, transactionChanges, isFromExpenseRep
         ...(_.has(transactionChanges, 'amount') && {amount: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
         ...(_.has(transactionChanges, 'currency') && {currency: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
         ...(_.has(transactionChanges, 'merchant') && {merchant: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(_.has(transactionChanges, 'waypoints') && {waypoints: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(_.has(transactionChanges, 'billable') && {billable: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(_.has(transactionChanges, 'category') && {category: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(_.has(transactionChanges, 'tag') && {tag: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
     };
 
     return updatedTransaction;
@@ -158,6 +188,7 @@ function getUpdatedTransaction(transaction, transactionChanges, isFromExpenseRep
  *
  * @param {String} transactionID
  * @returns {Object}
+ * @deprecated Use withOnyx() or Onyx.connect() instead
  */
 function getTransaction(transactionID) {
     return lodashGet(allTransactions, `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {});
@@ -228,6 +259,46 @@ function getMerchant(transaction) {
     return lodashGet(transaction, 'modifiedMerchant', null) || lodashGet(transaction, 'merchant', '');
 }
 
+/**
+ * Return the waypoints field from the transaction, return the modifiedWaypoints if present.
+ *
+ * @param {Object} transaction
+ * @returns {String}
+ */
+function getWaypoints(transaction) {
+    return lodashGet(transaction, 'modifiedWaypoints', null) || lodashGet(transaction, ['comment', 'waypoints']);
+}
+
+/**
+ * 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 billable field from the transaction. This "billable" field has no "modified" complement.
+ *
+ * @param {Object} transaction
+ * @return {Boolean}
+ */
+function getBillable(transaction) {
+    return lodashGet(transaction, 'billable', false);
+}
+
+/**
+ * Return the tag from the transaction. This "tag" field has no "modified" complement.
+ *
+ * @param {Object} transaction
+ * @return {String}
+ */
+function getTag(transaction) {
+    return lodashGet(transaction, 'tag', '');
+}
+
 /**
  * Return the created field from the transaction, return the modifiedCreated if present.
  *
@@ -272,12 +343,23 @@ function hasMissingSmartscanFields(transaction) {
     return hasReceipt(transaction) && !isDistanceRequest(transaction) && !isReceiptBeingScanned(transaction) && areRequiredFieldsEmpty(transaction);
 }
 
+/**
+ * Check if the transaction has a defined route
+ *
+ * @param {Object} transaction
+ * @returns {Boolean}
+ */
+function hasRoute(transaction) {
+    return !!lodashGet(transaction, 'routes.route0.geometry.coordinates');
+}
+
 /**
  * Get the transactions related to a report preview with receipts
  * Get the details linked to the IOU reportAction
  *
  * @param {Object} reportAction
  * @returns {Object}
+ * @deprecated Use Onyx.connect() or withOnyx() instead
  */
 function getLinkedTransaction(reportAction = {}) {
     const transactionID = lodashGet(reportAction, ['originalMessage', 'IOUTransactionID'], '');
@@ -303,6 +385,15 @@ function waypointHasValidAddress(waypoint) {
     return true;
 }
 
+/**
+ * Converts the key of a waypoint to its index
+ * @param {String} key
+ * @returns {Number} waypoint index
+ */
+function getWaypointIndex(key) {
+    return Number(key.replace('waypoint', ''));
+}
+
 /**
  * Filters the waypoints which are valid and returns those
  * @param {Object} waypoints
@@ -310,7 +401,8 @@ function waypointHasValidAddress(waypoint) {
  * @returns {Object} validated waypoints
  */
 function getValidWaypoints(waypoints, reArrangeIndexes = false) {
-    const waypointValues = _.values(waypoints);
+    const sortedIndexes = _.map(_.keys(waypoints), (key) => getWaypointIndex(key)).sort();
+    const waypointValues = _.map(sortedIndexes, (index) => waypoints[`waypoint${index}`]);
     // Ensure the number of waypoints is between 2 and 25
     if (waypointValues.length < 2 || waypointValues.length > 25) {
         return {};
@@ -340,7 +432,6 @@ function getValidWaypoints(waypoints, reArrangeIndexes = false) {
         },
         {},
     );
-
     return validWaypoints;
 }
 
@@ -353,11 +444,18 @@ export {
     getCurrency,
     getMerchant,
     getCreated,
+    getCategory,
+    getBillable,
+    getTag,
     getLinkedTransaction,
     getAllReportTransactions,
     hasReceipt,
+    hasRoute,
     isReceiptBeingScanned,
     getValidWaypoints,
     isDistanceRequest,
+    getWaypoints,
     hasMissingSmartscanFields,
+    getWaypointIndex,
+    waypointHasValidAddress,
 };
diff --git a/src/libs/UpdateMultilineInputRange/index.ios.js b/src/libs/UpdateMultilineInputRange/index.ios.js
new file mode 100644
index 000000000000..85ed529a33bc
--- /dev/null
+++ b/src/libs/UpdateMultilineInputRange/index.ios.js
@@ -0,0 +1,23 @@
+/**
+ * Place the cursor at the end of the value (if there is a value in the input).
+ *
+ * When a multiline input contains a text value that goes beyond the scroll height, the cursor will be placed
+ * at the end of the text value, and automatically scroll the input field to this position after the field gains
+ * focus. This provides a better user experience in cases where the text in the field has to be edited. The auto-
+ * scroll behaviour works on all platforms except iOS native.
+ * See https://github.com/Expensify/App/issues/20836 for more details.
+ *
+ * @param {Object} input the input element
+ */
+export default function updateMultilineInputRange(input) {
+    if (!input) {
+        return;
+    }
+
+    /*
+     * Adding this iOS specific patch because of the scroll issue in native iOS
+     * Issue: does not scroll multiline input when text exceeds the maximum number of lines
+     * For more details: https://github.com/Expensify/App/pull/27702#issuecomment-1728651132
+     */
+    input.focus();
+}
diff --git a/src/libs/focusAndUpdateMultilineInputRange.js b/src/libs/UpdateMultilineInputRange/index.js
similarity index 80%
rename from src/libs/focusAndUpdateMultilineInputRange.js
rename to src/libs/UpdateMultilineInputRange/index.js
index b5e438899d3d..179d30dc611d 100644
--- a/src/libs/focusAndUpdateMultilineInputRange.js
+++ b/src/libs/UpdateMultilineInputRange/index.js
@@ -1,5 +1,5 @@
 /**
- * Focus a multiline text input and place the cursor at the end of the value (if there is a value in the input).
+ * Place the cursor at the end of the value (if there is a value in the input).
  *
  * When a multiline input contains a text value that goes beyond the scroll height, the cursor will be placed
  * at the end of the text value, and automatically scroll the input field to this position after the field gains
@@ -9,12 +9,11 @@
  *
  * @param {Object} input the input element
  */
-export default function focusAndUpdateMultilineInputRange(input) {
+export default function updateMultilineInputRange(input) {
     if (!input) {
         return;
     }
 
-    input.focus();
     if (input.value && input.setSelectionRange) {
         const length = input.value.length;
         input.setSelectionRange(length, length);
diff --git a/src/libs/Url.js b/src/libs/Url.ts
similarity index 65%
rename from src/libs/Url.js
rename to src/libs/Url.ts
index eb96b697a8fc..a21f007e8468 100644
--- a/src/libs/Url.js
+++ b/src/libs/Url.ts
@@ -1,10 +1,9 @@
 import 'react-native-url-polyfill/auto';
+
 /**
  * Add / to the end of any URL if not present
- * @param {String} url
- * @returns {String}
  */
-function addTrailingForwardSlash(url) {
+function addTrailingForwardSlash(url: string): string {
     if (!url.endsWith('/')) {
         return `${url}/`;
     }
@@ -13,10 +12,8 @@ function addTrailingForwardSlash(url) {
 
 /**
  * Get path from URL string
- * @param {String} url
- * @returns {String}
  */
-function getPathFromURL(url) {
+function getPathFromURL(url: string): string {
     try {
         const parsedUrl = new URL(url);
         const path = parsedUrl.pathname + parsedUrl.search + parsedUrl.hash;
@@ -29,12 +26,9 @@ function getPathFromURL(url) {
 
 /**
  * Determine if two urls have the same origin
- * @param {String} url1
- * @param {String} url2
- * @returns {Boolean}
  */
-function hasSameExpensifyOrigin(url1, url2) {
-    const removeW3 = (host) => host.replace(/^www\./i, '');
+function hasSameExpensifyOrigin(url1: string, url2: string): boolean {
+    const removeW3 = (host: string) => host.replace(/^www\./i, '');
     try {
         const parsedUrl1 = new URL(url1);
         const parsedUrl2 = new URL(url2);
@@ -47,9 +41,4 @@ function hasSameExpensifyOrigin(url1, url2) {
     }
 }
 
-export {
-    // eslint-disable-next-line import/prefer-default-export
-    addTrailingForwardSlash,
-    hasSameExpensifyOrigin,
-    getPathFromURL,
-};
+export {addTrailingForwardSlash, hasSameExpensifyOrigin, getPathFromURL};
diff --git a/src/libs/ValidationUtils.js b/src/libs/ValidationUtils.ts
similarity index 59%
rename from src/libs/ValidationUtils.js
rename to src/libs/ValidationUtils.ts
index 81b91e2101be..b94c240b6e92 100644
--- a/src/libs/ValidationUtils.js
+++ b/src/libs/ValidationUtils.ts
@@ -1,22 +1,23 @@
-import {subYears, addYears, startOfDay, endOfMonth, isAfter, isBefore, isValid, isWithinInterval, isSameDay, format} from 'date-fns';
-import _ from 'underscore';
+import {subYears, addYears, startOfDay, endOfMonth, parse, isAfter, isBefore, isValid, isWithinInterval, isSameDay, format} from 'date-fns';
 import {URL_REGEX_WITH_REQUIRED_PROTOCOL} from 'expensify-common/lib/Url';
 import {parsePhoneNumber} from 'awesome-phonenumber';
+import isDate from 'lodash/isDate';
+import isEmpty from 'lodash/isEmpty';
+import isObject from 'lodash/isObject';
 import CONST from '../CONST';
 import * as CardUtils from './CardUtils';
 import * as LoginUtils from './LoginUtils';
+import {Report} from '../types/onyx';
+import * as OnyxCommon from '../types/onyx/OnyxCommon';
 
 /**
  * Implements the Luhn Algorithm, a checksum formula used to validate credit card
  * numbers.
- *
- * @param {String} val
- * @returns {Boolean}
  */
-function validateCardNumber(val) {
+function validateCardNumber(value: string): boolean {
     let sum = 0;
-    for (let i = 0; i < val.length; i++) {
-        let intVal = parseInt(val.substr(i, 1), 10);
+    for (let i = 0; i < value.length; i++) {
+        let intVal = parseInt(value.substr(i, 1), 10);
         if (i % 2 === 0) {
             intVal *= 2;
             if (intVal > 9) {
@@ -30,11 +31,8 @@ function validateCardNumber(val) {
 
 /**
  * Validating that this is a valid address (PO boxes are not allowed)
- *
- * @param {String} value
- * @returns {Boolean}
  */
-function isValidAddress(value) {
+function isValidAddress(value: string): boolean {
     if (!CONST.REGEX.ANY_VALUE.test(value)) {
         return false;
     }
@@ -44,11 +42,8 @@ function isValidAddress(value) {
 
 /**
  * Validate date fields
- *
- * @param {String|Date} date
- * @returns {Boolean} true if valid
  */
-function isValidDate(date) {
+function isValidDate(date: string | Date): boolean {
     if (!date) {
         return false;
     }
@@ -61,11 +56,8 @@ function isValidDate(date) {
 
 /**
  * Validate that date entered isn't a future date.
- *
- * @param {String|Date} date
- * @returns {Boolean} true if valid
  */
-function isValidPastDate(date) {
+function isValidPastDate(date: string | Date): boolean {
     if (!date) {
         return false;
     }
@@ -78,33 +70,27 @@ function isValidPastDate(date) {
 
 /**
  * Used to validate a value that is "required".
- *
- * @param {*} value
- * @returns {Boolean}
  */
-function isRequiredFulfilled(value) {
-    if (_.isString(value)) {
-        return !_.isEmpty(value.trim());
+function isRequiredFulfilled(value: string | Date | unknown[] | Record<string, unknown>): boolean {
+    if (typeof value === 'string') {
+        return value.trim().length > 0;
     }
-    if (_.isDate(value)) {
+
+    if (isDate(value)) {
         return isValidDate(value);
     }
-    if (_.isArray(value) || _.isObject(value)) {
-        return !_.isEmpty(value);
+    if (Array.isArray(value) || isObject(value)) {
+        return !isEmpty(value);
     }
     return Boolean(value);
 }
 
 /**
  * Used to add requiredField error to the fields passed.
- *
- * @param {Object} values
- * @param {Array} requiredFields
- * @returns {Object}
  */
-function getFieldRequiredErrors(values, requiredFields) {
-    const errors = {};
-    _.each(requiredFields, (fieldKey) => {
+function getFieldRequiredErrors(values: OnyxCommon.Errors, requiredFields: string[]) {
+    const errors: OnyxCommon.Errors = {};
+    requiredFields.forEach((fieldKey) => {
         if (isRequiredFulfilled(values[fieldKey])) {
             return;
         }
@@ -119,11 +105,8 @@ function getFieldRequiredErrors(values, requiredFields) {
  * 2. MM/YYYY
  * 3. MMYY
  * 4. MMYYYY
- *
- * @param {String} string
- * @returns {Boolean}
  */
-function isValidExpirationDate(string) {
+function isValidExpirationDate(string: string): boolean {
     if (!CONST.REGEX.CARD_EXPIRATION_DATE.test(string)) {
         return false;
     }
@@ -136,21 +119,15 @@ function isValidExpirationDate(string) {
 /**
  * Validates that this is a valid security code
  * in the XXX or XXXX format.
- *
- * @param {String} string
- * @returns {Boolean}
  */
-function isValidSecurityCode(string) {
+function isValidSecurityCode(string: string): boolean {
     return CONST.REGEX.CARD_SECURITY_CODE.test(string);
 }
 
 /**
  * Validates a debit card number (15 or 16 digits).
- *
- * @param {String} string
- * @returns {Boolean}
  */
-function isValidDebitCard(string) {
+function isValidDebitCard(string: string): boolean {
     if (!CONST.REGEX.CARD_NUMBER.test(string)) {
         return false;
     }
@@ -158,54 +135,26 @@ function isValidDebitCard(string) {
     return validateCardNumber(string);
 }
 
-/**
- * @param {String} code
- * @returns {Boolean}
- */
-function isValidIndustryCode(code) {
+function isValidIndustryCode(code: string): boolean {
     return CONST.REGEX.INDUSTRY_CODE.test(code);
 }
 
-/**
- * @param {String} zipCode
- * @returns {Boolean}
- */
-function isValidZipCode(zipCode) {
+function isValidZipCode(zipCode: string): boolean {
     return CONST.REGEX.ZIP_CODE.test(zipCode);
 }
 
-/**
- * @param {String} ssnLast4
- * @returns {Boolean}
- */
-function isValidSSNLastFour(ssnLast4) {
+function isValidSSNLastFour(ssnLast4: string): boolean {
     return CONST.REGEX.SSN_LAST_FOUR.test(ssnLast4);
 }
 
-/**
- * @param {String} ssnFull9
- * @returns {Boolean}
- */
-function isValidSSNFullNine(ssnFull9) {
+function isValidSSNFullNine(ssnFull9: string): boolean {
     return CONST.REGEX.SSN_FULL_NINE.test(ssnFull9);
 }
 
-/**
- *
- * @param {String} paypalUsername
- * @returns {Boolean}
- */
-function isValidPaypalUsername(paypalUsername) {
-    return Boolean(paypalUsername) && CONST.REGEX.PAYPAL_ME_USERNAME.test(paypalUsername);
-}
-
 /**
  * Validate that a date meets the minimum age requirement.
- *
- * @param {String} date
- * @returns {Boolean}
  */
-function meetsMinimumAgeRequirement(date) {
+function meetsMinimumAgeRequirement(date: string): boolean {
     const testDate = new Date(date);
     const minDate = subYears(new Date(), CONST.DATE_BIRTH.MIN_AGE_FOR_PAYMENT);
     return isValid(testDate) && (isSameDay(testDate, minDate) || isBefore(testDate, minDate));
@@ -213,11 +162,8 @@ function meetsMinimumAgeRequirement(date) {
 
 /**
  * Validate that a date meets the maximum age requirement.
- *
- * @param {String} date
- * @returns {Boolean}
  */
-function meetsMaximumAgeRequirement(date) {
+function meetsMaximumAgeRequirement(date: string): boolean {
     const testDate = new Date(date);
     const maxDate = subYears(new Date(), CONST.DATE_BIRTH.MAX_AGE);
     return isValid(testDate) && (isSameDay(testDate, maxDate) || isAfter(testDate, maxDate));
@@ -225,50 +171,43 @@ function meetsMaximumAgeRequirement(date) {
 
 /**
  * Validate that given date is in a specified range of years before now.
- *
- * @param {String} date
- * @param {Number} minimumAge
- * @param {Number} maximumAge
- * @returns {String|Array}
  */
-function getAgeRequirementError(date, minimumAge, maximumAge) {
+function getAgeRequirementError(date: string, minimumAge: number, maximumAge: number): string | Array<string | Record<string, string>> {
     const currentDate = startOfDay(new Date());
-    const recentDate = subYears(currentDate, minimumAge);
-    const longAgoDate = subYears(currentDate, maximumAge);
-    const testDate = new Date(date);
+    const testDate = parse(date, CONST.DATE.FNS_FORMAT_STRING, currentDate);
+
     if (!isValid(testDate)) {
         return 'common.error.dateInvalid';
     }
-    if (isWithinInterval(testDate, {start: longAgoDate, end: recentDate})) {
+
+    const maximalDate = subYears(currentDate, minimumAge);
+    const minimalDate = subYears(currentDate, maximumAge);
+
+    if (isWithinInterval(testDate, {start: minimalDate, end: maximalDate})) {
         return '';
     }
-    if (isSameDay(testDate, recentDate) || isAfter(testDate, recentDate)) {
-        return ['privatePersonalDetails.error.dateShouldBeBefore', {dateString: format(recentDate, CONST.DATE.FNS_FORMAT_STRING)}];
+
+    if (isSameDay(testDate, maximalDate) || isAfter(testDate, maximalDate)) {
+        return ['privatePersonalDetails.error.dateShouldBeBefore', {dateString: format(maximalDate, CONST.DATE.FNS_FORMAT_STRING)}];
     }
-    return ['privatePersonalDetails.error.dateShouldBeAfter', {dateString: format(longAgoDate, CONST.DATE.FNS_FORMAT_STRING)}];
+
+    return ['privatePersonalDetails.error.dateShouldBeAfter', {dateString: format(minimalDate, CONST.DATE.FNS_FORMAT_STRING)}];
 }
 
 /**
  * Similar to backend, checks whether a website has a valid URL or not.
  * http/https/ftp URL scheme required.
- *
- * @param {String} url
- * @returns {Boolean}
  */
-function isValidWebsite(url) {
+function isValidWebsite(url: string): boolean {
     return new RegExp(`^${URL_REGEX_WITH_REQUIRED_PROTOCOL}$`, 'i').test(url);
 }
 
-/**
- * @param {Object} identity
- * @returns {Object}
- */
-function validateIdentity(identity) {
+function validateIdentity(identity: Record<string, string>): Record<string, boolean> {
     const requiredFields = ['firstName', 'lastName', 'street', 'city', 'zipCode', 'state', 'ssnLast4', 'dob'];
-    const errors = {};
+    const errors: Record<string, boolean> = {};
 
     // Check that all required fields are filled
-    _.each(requiredFields, (fieldName) => {
+    requiredFields.forEach((fieldName) => {
         if (isRequiredFulfilled(identity[fieldName])) {
             return;
         }
@@ -297,54 +236,41 @@ function validateIdentity(identity) {
     return errors;
 }
 
-/**
- * @param {String} phoneNumber
- * @param {Boolean} [isCountryCodeOptional]
- * @returns {Boolean}
- */
-function isValidUSPhone(phoneNumber = '', isCountryCodeOptional) {
+function isValidUSPhone(phoneNumber = '', isCountryCodeOptional?: boolean): boolean {
     const phone = phoneNumber || '';
-    const regionCode = isCountryCodeOptional ? CONST.COUNTRY.US : null;
+    const regionCode = isCountryCodeOptional ? CONST.COUNTRY.US : undefined;
 
     const parsedPhoneNumber = parsePhoneNumber(phone, {regionCode});
     return parsedPhoneNumber.possible && parsedPhoneNumber.regionCode === CONST.COUNTRY.US;
 }
 
-/**
- * @param {string} validateCode
- * @returns {Boolean}
- */
-function isValidValidateCode(validateCode) {
-    return validateCode.match(CONST.VALIDATE_CODE_REGEX_STRING);
+function isValidValidateCode(validateCode: string): boolean {
+    return Boolean(validateCode.match(CONST.VALIDATE_CODE_REGEX_STRING));
 }
 
-/**
- * @param {String} code
- * @returns {Boolean}
- */
-function isValidTwoFactorCode(code) {
+function isValidRecoveryCode(recoveryCode: string): boolean {
+    return Boolean(recoveryCode.match(CONST.RECOVERY_CODE_REGEX_STRING));
+}
+
+function isValidTwoFactorCode(code: string): boolean {
     return Boolean(code.match(CONST.REGEX.CODE_2FA));
 }
 
 /**
  * Checks whether a value is a numeric string including `(`, `)`, `-` and optional leading `+`
- * @param {String} input
- * @returns {Boolean}
  */
-function isNumericWithSpecialChars(input) {
+function isNumericWithSpecialChars(input: string): boolean {
     return /^\+?[\d\\+]*$/.test(LoginUtils.getPhoneNumberWithoutSpecialChars(input));
 }
 
 /**
  * Checks the given number is a valid US Routing Number
  * using ABA routingNumber checksum algorithm: http://www.brainjar.com/js/validation/
- * @param {String} number
- * @returns {Boolean}
  */
-function isValidRoutingNumber(number) {
+function isValidRoutingNumber(routingNumber: string): boolean {
     let n = 0;
-    for (let i = 0; i < number.length; i += 3) {
-        n += parseInt(number.charAt(i), 10) * 3 + parseInt(number.charAt(i + 1), 10) * 7 + parseInt(number.charAt(i + 2), 10);
+    for (let i = 0; i < routingNumber.length; i += 3) {
+        n += parseInt(routingNumber.charAt(i), 10) * 3 + parseInt(routingNumber.charAt(i + 1), 10) * 7 + parseInt(routingNumber.charAt(i + 2), 10);
     }
 
     // If the resulting sum is an even multiple of ten (but not zero),
@@ -357,57 +283,39 @@ function isValidRoutingNumber(number) {
 
 /**
  * Checks that the provided name doesn't contain any commas or semicolons
- *
- * @param {String} name
- * @returns {Boolean}
  */
-function isValidDisplayName(name) {
+function isValidDisplayName(name: string): boolean {
     return !name.includes(',') && !name.includes(';');
 }
 
 /**
  * Checks that the provided legal name doesn't contain special characters
- *
- * @param {String} name
- * @returns {Boolean}
  */
-function isValidLegalName(name) {
+function isValidLegalName(name: string): boolean {
     return CONST.REGEX.ALPHABETIC_AND_LATIN_CHARS.test(name);
 }
 
 /**
  * Checks if the provided string includes any of the provided reserved words
- *
- * @param {String} value
- * @param {String[]} reservedWords
- * @returns {Boolean}
  */
-function doesContainReservedWord(value, reservedWords) {
+function doesContainReservedWord(value: string, reservedWords: string[]): boolean {
     const valueToCheck = value.trim().toLowerCase();
-    return _.some(reservedWords, (reservedWord) => valueToCheck.includes(reservedWord.toLowerCase()));
+    return reservedWords.some((reservedWord) => valueToCheck.includes(reservedWord.toLowerCase()));
 }
 
 /**
  * Checks if is one of the certain names which are reserved for default rooms
  * and should not be used for policy rooms.
- *
- * @param {String} roomName
- * @returns {Boolean}
  */
-function isReservedRoomName(roomName) {
-    return _.contains(CONST.REPORT.RESERVED_ROOM_NAMES, roomName);
+function isReservedRoomName(roomName: string): boolean {
+    return (CONST.REPORT.RESERVED_ROOM_NAMES as readonly string[]).includes(roomName);
 }
 
 /**
  * Checks if the room name already exists.
- *
- * @param {String} roomName
- * @param {Object} reports
- * @param {String} policyID
- * @returns {Boolean}
  */
-function isExistingRoomName(roomName, reports, policyID) {
-    return _.some(reports, (report) => report && report.policyID === policyID && report.reportName === roomName);
+function isExistingRoomName(roomName: string, reports: Record<string, Report>, policyID: string): boolean {
+    return Object.values(reports).some((report) => report && report.policyID === policyID && report.reportName === roomName);
 }
 
 /**
@@ -415,31 +323,22 @@ function isExistingRoomName(roomName, reports, policyID) {
  * - It starts with a hash '#'
  * - After the first character, it contains only lowercase letters, numbers, and dashes
  * - It's between 1 and MAX_ROOM_NAME_LENGTH characters long
- *
- * @param {String} roomName
- * @returns {Boolean}
  */
-function isValidRoomName(roomName) {
+function isValidRoomName(roomName: string): boolean {
     return CONST.REGEX.ROOM_NAME.test(roomName);
 }
 
 /**
  * Checks if tax ID consists of 9 digits
- *
- * @param {String} taxID
- * @returns {Boolean}
  */
-function isValidTaxID(taxID) {
-    return taxID && CONST.REGEX.TAX_ID.test(taxID);
+function isValidTaxID(taxID: string): boolean {
+    return CONST.REGEX.TAX_ID.test(taxID);
 }
 
 /**
  * Checks if a string value is a number.
- *
- * @param {String} value
- * @returns {Boolean}
  */
-function isNumeric(value) {
+function isNumeric(value: string): boolean {
     if (typeof value !== 'string') {
         return false;
     }
@@ -448,12 +347,9 @@ function isNumeric(value) {
 
 /**
  * Checks that the provided accountID is a number and bigger than 0.
- *
- * @param {Number} accountID
- * @returns {Boolean}
  */
-function isValidAccountRoute(accountID) {
-    return CONST.REGEX.NUMBER.test(accountID) && accountID > 0;
+function isValidAccountRoute(accountID: number): boolean {
+    return CONST.REGEX.NUMBER.test(String(accountID)) && accountID > 0;
 }
 
 export {
@@ -475,7 +371,6 @@ export {
     validateIdentity,
     isValidTwoFactorCode,
     isNumericWithSpecialChars,
-    isValidPaypalUsername,
     isValidRoutingNumber,
     isValidSSNLastFour,
     isValidSSNFullNine,
@@ -489,4 +384,5 @@ export {
     doesContainReservedWord,
     isNumeric,
     isValidAccountRoute,
+    isValidRecoveryCode,
 };
diff --git a/src/libs/Visibility/index.desktop.js b/src/libs/Visibility/index.desktop.ts
similarity index 73%
rename from src/libs/Visibility/index.desktop.js
rename to src/libs/Visibility/index.desktop.ts
index e3a7eab5bf56..bdc8b9a4267a 100644
--- a/src/libs/Visibility/index.desktop.js
+++ b/src/libs/Visibility/index.desktop.ts
@@ -1,31 +1,19 @@
 import ELECTRON_EVENTS from '../../../desktop/ELECTRON_EVENTS';
+import {HasFocus, IsVisible, OnVisibilityChange} from './types';
 
 /**
  * Detects whether the app is visible or not. Electron supports document.visibilityState,
  * but switching to another app while Electron is partially occluded will not trigger a state of hidden
  * so we ask the main process synchronously whether the BrowserWindow.isFocused()
- *
- * @returns {Boolean}
  */
-function isVisible() {
-    return window.electron.sendSync(ELECTRON_EVENTS.REQUEST_VISIBILITY);
-}
+const isVisible: IsVisible = () => !!window.electron.sendSync(ELECTRON_EVENTS.REQUEST_VISIBILITY);
 
-/**
- * @returns {Boolean}
- */
-function hasFocus() {
-    return true;
-}
+const hasFocus: HasFocus = () => true;
 
 /**
  * Adds event listener for changes in visibility state
- *
- * @param {Function} callback
- *
- * @return {Function} removes the listener
  */
-function onVisibilityChange(callback) {
+const onVisibilityChange: OnVisibilityChange = (callback) => {
     // Deliberately strip callback argument to be consistent across implementations
     window.electron.on(ELECTRON_EVENTS.FOCUS, () => callback());
     window.electron.on(ELECTRON_EVENTS.BLUR, () => callback());
@@ -34,7 +22,7 @@ function onVisibilityChange(callback) {
         window.electron.removeAllListeners(ELECTRON_EVENTS.FOCUS);
         window.electron.removeAllListeners(ELECTRON_EVENTS.BLUR);
     };
-}
+};
 
 export default {
     isVisible,
diff --git a/src/libs/Visibility/index.native.js b/src/libs/Visibility/index.native.ts
similarity index 63%
rename from src/libs/Visibility/index.native.js
rename to src/libs/Visibility/index.native.ts
index b888cf1a2b9f..695df3651da7 100644
--- a/src/libs/Visibility/index.native.js
+++ b/src/libs/Visibility/index.native.ts
@@ -2,32 +2,21 @@
 // they do not use the Notification lib.
 
 import {AppState} from 'react-native';
+import {HasFocus, IsVisible, OnVisibilityChange} from './types';
 
-/**
- * @return {Boolean}
- */
-const isVisible = () => AppState.currentState === 'active';
+const isVisible: IsVisible = () => AppState.currentState === 'active';
 
-/**
- * @returns {Boolean}
- */
-function hasFocus() {
-    return true;
-}
+const hasFocus: HasFocus = () => true;
 
 /**
  * Adds event listener for changes in visibility state
- *
- * @param {Function} callback
- *
- * @return {Function} removes the listener
  */
-function onVisibilityChange(callback) {
+const onVisibilityChange: OnVisibilityChange = (callback) => {
     // Deliberately strip callback argument to be consistent across implementations
     const subscription = AppState.addEventListener('change', () => callback());
 
     return () => subscription.remove();
-}
+};
 
 export default {
     isVisible,
diff --git a/src/libs/Visibility/index.js b/src/libs/Visibility/index.ts
similarity index 61%
rename from src/libs/Visibility/index.js
rename to src/libs/Visibility/index.ts
index 91a003168ccd..4cf18b010a07 100644
--- a/src/libs/Visibility/index.js
+++ b/src/libs/Visibility/index.ts
@@ -1,36 +1,25 @@
 import {AppState} from 'react-native';
+import {HasFocus, IsVisible, OnVisibilityChange} from './types';
 
 /**
  * Detects whether the app is visible or not.
- *
- * @returns {Boolean}
  */
-function isVisible() {
-    return document.visibilityState === 'visible';
-}
+const isVisible: IsVisible = () => document.visibilityState === 'visible';
 
 /**
  * Whether the app is focused.
- *
- * @returns {Boolean}
  */
-function hasFocus() {
-    return document.hasFocus();
-}
+const hasFocus: HasFocus = () => document.hasFocus();
 
 /**
  * Adds event listener for changes in visibility state
- *
- * @param {Function} callback
- *
- * @return {Function} removes the listener
  */
-function onVisibilityChange(callback) {
+const onVisibilityChange: OnVisibilityChange = (callback) => {
     // Deliberately strip callback argument to be consistent across implementations
     const subscription = AppState.addEventListener('change', () => callback());
 
     return () => subscription.remove();
-}
+};
 
 export default {
     isVisible,
diff --git a/src/libs/Visibility/types.ts b/src/libs/Visibility/types.ts
new file mode 100644
index 000000000000..0332f24740ce
--- /dev/null
+++ b/src/libs/Visibility/types.ts
@@ -0,0 +1,5 @@
+type IsVisible = () => boolean;
+type HasFocus = () => boolean;
+type OnVisibilityChange = (callback: () => void) => () => void;
+
+export type {IsVisible, HasFocus, OnVisibilityChange};
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/__mocks__/Log.js b/src/libs/__mocks__/Log.js
deleted file mode 100644
index 179a665d2bd9..000000000000
--- a/src/libs/__mocks__/Log.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Set up manual mocks for any Logging methods that are supposed hit the 'server',
-// this is needed because before, the Logging queue would get flushed while tests were running,
-// causing unexpected calls to HttpUtils.xhr() which would cause mock mismatches and flaky tests.
-export default {
-    info: (message) => console.debug(`[info] ${message} (mocked)`),
-    alert: (message) => console.debug(`[alert] ${message} (mocked)`),
-    warn: (message) => console.debug(`[warn] ${message} (mocked)`),
-    hmmm: (message) => console.debug(`[hmmm] ${message} (mocked)`),
-};
diff --git a/src/libs/__mocks__/Log.ts b/src/libs/__mocks__/Log.ts
new file mode 100644
index 000000000000..39336db1fa51
--- /dev/null
+++ b/src/libs/__mocks__/Log.ts
@@ -0,0 +1,9 @@
+// Set up manual mocks for any Logging methods that are supposed hit the 'server',
+// this is needed because before, the Logging queue would get flushed while tests were running,
+// causing unexpected calls to HttpUtils.xhr() which would cause mock mismatches and flaky tests.
+export default {
+    info: (message: string) => console.debug(`[info] ${message} (mocked)`),
+    alert: (message: string) => console.debug(`[alert] ${message} (mocked)`),
+    warn: (message: string) => console.debug(`[warn] ${message} (mocked)`),
+    hmmm: (message: string) => console.debug(`[hmmm] ${message} (mocked)`),
+};
diff --git a/src/libs/__mocks__/Permissions.js b/src/libs/__mocks__/Permissions.ts
similarity index 54%
rename from src/libs/__mocks__/Permissions.js
rename to src/libs/__mocks__/Permissions.ts
index fffaea5793d4..2c062590573e 100644
--- a/src/libs/__mocks__/Permissions.js
+++ b/src/libs/__mocks__/Permissions.ts
@@ -1,5 +1,5 @@
-import _ from 'underscore';
 import CONST from '../../CONST';
+import Beta from '../../types/onyx/Beta';
 
 /**
  * This module is mocked in tests because all the permission methods call canUseAllBetas() and that will
@@ -10,8 +10,8 @@ import CONST from '../../CONST';
 
 export default {
     ...jest.requireActual('../Permissions'),
-    canUseDefaultRooms: (betas) => _.contains(betas, CONST.BETAS.DEFAULT_ROOMS),
-    canUsePolicyRooms: (betas) => _.contains(betas, CONST.BETAS.POLICY_ROOMS),
-    canUseIOUSend: (betas) => _.contains(betas, CONST.BETAS.IOU_SEND),
-    canUseCustomStatus: (betas) => _.contains(betas, CONST.BETAS.CUSTOM_STATUS),
+    canUseDefaultRooms: (betas: Beta[]) => betas.includes(CONST.BETAS.DEFAULT_ROOMS),
+    canUsePolicyRooms: (betas: Beta[]) => betas.includes(CONST.BETAS.POLICY_ROOMS),
+    canUseIOUSend: (betas: Beta[]) => betas.includes(CONST.BETAS.IOU_SEND),
+    canUseCustomStatus: (betas: Beta[]) => betas.includes(CONST.BETAS.CUSTOM_STATUS),
 };
diff --git a/src/libs/actions/ActiveClients.js b/src/libs/actions/ActiveClients.ts
similarity index 69%
rename from src/libs/actions/ActiveClients.js
rename to src/libs/actions/ActiveClients.ts
index 744944cfef1c..45fcff402f49 100644
--- a/src/libs/actions/ActiveClients.js
+++ b/src/libs/actions/ActiveClients.ts
@@ -1,11 +1,7 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 
-/**
- * @param {Array} activeClients
- * @return {Promise}
- */
-function setActiveClients(activeClients) {
+function setActiveClients(activeClients: string[]): Promise<void> {
     return Onyx.set(ONYXKEYS.ACTIVE_CLIENTS, activeClients);
 }
 
diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
index 90c2a9ec4f16..b8be35aa1919 100644
--- a/src/libs/actions/App.js
+++ b/src/libs/actions/App.js
@@ -1,4 +1,3 @@
-import moment from 'moment-timezone';
 import {AppState} from 'react-native';
 import Onyx from 'react-native-onyx';
 import lodashGet from 'lodash/get';
@@ -142,10 +141,11 @@ function getPolicyParamsForOpenOrReconnect() {
 
 /**
  * Returns the Onyx data that is used for both the OpenApp and ReconnectApp API commands.
+ * @param {Boolean} isOpenApp
  * @returns {Object}
  */
-function getOnyxDataForOpenOrReconnect() {
-    return {
+function getOnyxDataForOpenOrReconnect(isOpenApp = false) {
+    const defaultData = {
         optimisticData: [
             {
                 onyxMethod: Onyx.METHOD.MERGE,
@@ -168,6 +168,35 @@ function getOnyxDataForOpenOrReconnect() {
             },
         ],
     };
+    if (!isOpenApp) {
+        return defaultData;
+    }
+    return {
+        optimisticData: [
+            ...defaultData.optimisticData,
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.IS_LOADING_APP,
+                value: true,
+            },
+        ],
+        successData: [
+            ...defaultData.successData,
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.IS_LOADING_APP,
+                value: false,
+            },
+        ],
+        failureData: [
+            ...defaultData.failureData,
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.IS_LOADING_APP,
+                value: false,
+            },
+        ],
+    };
 }
 
 /**
@@ -175,7 +204,7 @@ function getOnyxDataForOpenOrReconnect() {
  */
 function openApp() {
     getPolicyParamsForOpenOrReconnect().then((policyParams) => {
-        API.read('OpenApp', policyParams, getOnyxDataForOpenOrReconnect());
+        API.read('OpenApp', policyParams, getOnyxDataForOpenOrReconnect(true));
     });
 }
 
@@ -292,14 +321,14 @@ function createWorkspaceAndNavigateToIt(policyOwnerEmail = '', makeMeAdmin = fal
         .then(() => {
             if (transitionFromOldDot) {
                 // We must call goBack() to remove the /transition route from history
-                Navigation.goBack();
+                Navigation.goBack(ROUTES.HOME);
             }
 
             if (shouldNavigateToAdminChat) {
-                Navigation.navigate(ROUTES.getReportRoute(adminsChatReportID));
+                Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(adminsChatReportID));
             }
 
-            Navigation.navigate(ROUTES.getWorkspaceInitialRoute(policyID));
+            Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(policyID));
         })
         .then(endSignOnTransition);
 }
@@ -356,7 +385,7 @@ function setUpPoliciesAndNavigate(session, shouldNavigateToAdminChat) {
         Navigation.isNavigationReady()
             .then(() => {
                 // We must call goBack() to remove the /transition route from history
-                Navigation.goBack();
+                Navigation.goBack(ROUTES.HOME);
                 Navigation.navigate(exitTo);
             })
             .then(endSignOnTransition);
@@ -372,7 +401,7 @@ function redirectThirdPartyDesktopSignIn() {
 
     if (url.pathname === `/${ROUTES.GOOGLE_SIGN_IN}` || url.pathname === `/${ROUTES.APPLE_SIGN_IN}`) {
         Navigation.isNavigationReady().then(() => {
-            Navigation.goBack();
+            Navigation.goBack(ROUTES.HOME);
             Navigation.navigate(ROUTES.DESKTOP_SIGN_IN_REDIRECT);
         });
     }
@@ -385,7 +414,7 @@ function openProfile(personalDetails) {
     if (lodashGet(oldTimezoneData, 'automatic', true)) {
         newTimezoneData = {
             automatic: true,
-            selected: moment.tz.guess(true),
+            selected: Intl.DateTimeFormat().resolvedOptions().timeZone,
         };
     }
 
@@ -439,6 +468,15 @@ function beginDeepLinkRedirect(shouldAuthenticateWithCurrentAccount = true) {
 
     // eslint-disable-next-line rulesdir/no-api-side-effects-method
     API.makeRequestWithSideEffects('OpenOldDotLink', {shouldRetry: false}, {}).then((response) => {
+        if (!response) {
+            Log.alert(
+                'Trying to redirect via deep link, but the response is empty. User likely not authenticated.',
+                {response, shouldAuthenticateWithCurrentAccount, currentUserAccountID},
+                true,
+            );
+            return;
+        }
+
         Browser.openRouteInDesktopApp(response.shortLivedAuthToken, currentUserEmail);
     });
 }
diff --git a/src/libs/actions/Chronos.js b/src/libs/actions/Chronos.ts
similarity index 82%
rename from src/libs/actions/Chronos.js
rename to src/libs/actions/Chronos.ts
index b9c0eed7b354..1b46a68a1afe 100644
--- a/src/libs/actions/Chronos.js
+++ b/src/libs/actions/Chronos.ts
@@ -1,16 +1,10 @@
-import _ from 'underscore';
 import Onyx from 'react-native-onyx';
 import CONST from '../../CONST';
 import ONYXKEYS from '../../ONYXKEYS';
 import * as API from '../API';
+import {ChronosOOOEvent} from '../../types/onyx/OriginalMessage';
 
-/**
- * @param {String} reportID
- * @param {String} reportActionID
- * @param {String} eventID
- * @param {Object[]} events
- */
-const removeEvent = (reportID, reportActionID, eventID, events) => {
+const removeEvent = (reportID: string, reportActionID: string, eventID: string, events: ChronosOOOEvent[]) => {
     const optimisticData = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -19,7 +13,7 @@ const removeEvent = (reportID, reportActionID, eventID, events) => {
                 [reportActionID]: {
                     pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                     originalMessage: {
-                        events: _.reject(events, (event) => event.id === eventID),
+                        events: events.filter((event) => event.id !== eventID),
                     },
                 },
             },
diff --git a/src/libs/actions/CloseAccount.js b/src/libs/actions/CloseAccount.ts
similarity index 100%
rename from src/libs/actions/CloseAccount.js
rename to src/libs/actions/CloseAccount.ts
diff --git a/src/libs/actions/Composer.js b/src/libs/actions/Composer.ts
similarity index 69%
rename from src/libs/actions/Composer.js
rename to src/libs/actions/Composer.ts
index 9a75e3662cd8..d3f9ef9814a5 100644
--- a/src/libs/actions/Composer.js
+++ b/src/libs/actions/Composer.ts
@@ -1,10 +1,7 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 
-/**
- * @param {Boolean} shouldShowComposeInput
- */
-function setShouldShowComposeInput(shouldShowComposeInput) {
+function setShouldShowComposeInput(shouldShowComposeInput: boolean) {
     Onyx.set(ONYXKEYS.SHOULD_SHOW_COMPOSE_INPUT, shouldShowComposeInput);
 }
 
diff --git a/src/libs/actions/CurrentDate.js b/src/libs/actions/CurrentDate.ts
similarity index 74%
rename from src/libs/actions/CurrentDate.js
rename to src/libs/actions/CurrentDate.ts
index 078b35a760cb..b19a3430e96f 100644
--- a/src/libs/actions/CurrentDate.js
+++ b/src/libs/actions/CurrentDate.ts
@@ -1,10 +1,7 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 
-/**
- * @param {String} currentDate
- */
-function setCurrentDate(currentDate) {
+function setCurrentDate(currentDate: string) {
     Onyx.set(ONYXKEYS.CURRENT_DATE, currentDate);
 }
 
diff --git a/src/libs/actions/DemoActions.js b/src/libs/actions/DemoActions.js
deleted file mode 100644
index 4ba9f6ee33a0..000000000000
--- a/src/libs/actions/DemoActions.js
+++ /dev/null
@@ -1,108 +0,0 @@
-import Onyx from 'react-native-onyx';
-import _ from 'underscore';
-import lodashGet from 'lodash/get';
-import CONST from '../../CONST';
-import * as API from '../API';
-import * as ReportUtils from '../ReportUtils';
-import Navigation from '../Navigation/Navigation';
-import ROUTES from '../../ROUTES';
-import ONYXKEYS from '../../ONYXKEYS';
-import * as Localize from '../Localize';
-
-/**
- * @param {String} workspaceOwnerEmail email of the workspace owner
- * @param {String} apiCommand
- */
-function createDemoWorkspaceAndNavigate(workspaceOwnerEmail, apiCommand) {
-    // Try to navigate to existing demo workspace expense chat if it exists in Onyx
-    const demoWorkspaceChatReportID = ReportUtils.getPolicyExpenseChatReportIDByOwner(workspaceOwnerEmail);
-    if (demoWorkspaceChatReportID) {
-        // We must call goBack() to remove the demo route from nav history
-        Navigation.goBack();
-        Navigation.navigate(ROUTES.getReportRoute(demoWorkspaceChatReportID));
-        return;
-    }
-
-    // We use makeRequestWithSideEffects here because we need to get the workspace chat report ID to navigate to it after it's created
-    // eslint-disable-next-line rulesdir/no-api-side-effects-method
-    API.makeRequestWithSideEffects(apiCommand).then((response) => {
-        // Get report updates from Onyx response data
-        const reportUpdate = _.find(response.onyxData, ({key}) => key === ONYXKEYS.COLLECTION.REPORT);
-        if (!reportUpdate) {
-            // If there's no related onyx data, navigate the user home so they're not stuck.
-            Navigation.goBack();
-            Navigation.navigate(ROUTES.HOME);
-            return;
-        }
-
-        // Get the policy expense chat update
-        const policyExpenseChatReport = _.find(reportUpdate.value, ({chatType}) => chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT);
-        if (!policyExpenseChatReport) {
-            // If there's no related onyx data, navigate the user home so they're not stuck.
-            Navigation.goBack();
-            Navigation.navigate(ROUTES.HOME);
-            return;
-        }
-
-        // Navigate to the new policy expense chat report
-        // Note: We must call goBack() to remove the demo route from history
-        Navigation.goBack();
-        Navigation.navigate(ROUTES.getReportRoute(policyExpenseChatReport.reportID));
-    });
-}
-
-function runSbeDemo() {
-    createDemoWorkspaceAndNavigate(CONST.EMAIL.SBE, 'CreateSbeDemoWorkspace');
-}
-
-function runSaastrDemo() {
-    createDemoWorkspaceAndNavigate(CONST.EMAIL.SAASTR, 'CreateSaastrDemoWorkspace');
-}
-
-/**
- * Runs code for specific demos, based on the provided URL
- *
- * @param {String} url - URL user is navigating to via deep link (or regular link in web)
- */
-function runDemoByURL(url = '') {
-    const cleanUrl = (url || '').toLowerCase();
-
-    if (cleanUrl.endsWith(ROUTES.SAASTR)) {
-        Onyx.set(ONYXKEYS.DEMO_INFO, {
-            saastr: {
-                isBeginningDemo: true,
-            },
-        });
-    } else if (cleanUrl.endsWith(ROUTES.SBE)) {
-        Onyx.set(ONYXKEYS.DEMO_INFO, {
-            sbe: {
-                isBeginningDemo: true,
-            },
-        });
-    } else {
-        // No demo is being run, so clear out demo info
-        Onyx.set(ONYXKEYS.DEMO_INFO, null);
-    }
-}
-
-/**
- * @param {Object} demoInfo
- * @returns {Object}
- */
-function getCustomTextForDemo(demoInfo = {}) {
-    if (lodashGet(demoInfo, 'saastr.isBeginningDemo')) {
-        return {
-            customHeadline: Localize.translateLocal('demos.saastr.signInWelcome'),
-            customHeroBody: Localize.translateLocal('demos.saastr.heroBody'),
-        };
-    }
-    if (lodashGet(demoInfo, 'sbe.isBeginningDemo')) {
-        return {
-            customHeadline: Localize.translateLocal('demos.sbe.signInWelcome'),
-            customHeroBody: Localize.translateLocal('demos.sbe.heroBody'),
-        };
-    }
-    return {};
-}
-
-export {runSaastrDemo, runSbeDemo, runDemoByURL, getCustomTextForDemo};
diff --git a/src/libs/actions/Device/getDeviceInfo/getBaseInfo.js b/src/libs/actions/Device/getDeviceInfo/getBaseInfo.js
index a02178cbc0a3..bb66f3fe7a9b 100644
--- a/src/libs/actions/Device/getDeviceInfo/getBaseInfo.js
+++ b/src/libs/actions/Device/getDeviceInfo/getBaseInfo.js
@@ -1,8 +1,8 @@
-import {version} from '../../../../../package.json';
+import packageConfig from '../../../../../package.json';
 
 export default function getBaseInfo() {
     return {
-        app_version: version,
+        app_version: packageConfig.version,
         timestamp: new Date().toISOString().slice(0, 19),
     };
 }
diff --git a/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.js b/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.js
deleted file mode 100644
index 29b004412f64..000000000000
--- a/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// Don't import this file with '* as Device'. It's known to make VSCode IntelliSense crash.
-import {getOSAndName} from 'expensify-common/lib/Device';
-
-export default getOSAndName;
diff --git a/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.native.js b/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.native.ts
similarity index 51%
rename from src/libs/actions/Device/getDeviceInfo/getOSAndName/index.native.js
rename to src/libs/actions/Device/getDeviceInfo/getOSAndName/index.native.ts
index 11d59abea1f1..bb9eb572570e 100644
--- a/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.native.js
+++ b/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.native.ts
@@ -1,11 +1,18 @@
 import Str from 'expensify-common/lib/str';
 import RNDeviceInfo from 'react-native-device-info';
+import GetOSAndName from './types';
 
-export default function getOSAndName() {
+const getOSAndName: GetOSAndName = () => {
     const deviceName = RNDeviceInfo.getDeviceNameSync();
     const prettyName = `${Str.UCFirst(RNDeviceInfo.getManufacturerSync() || '')} ${deviceName}`;
     return {
+        // Parameter names are predefined and we don't choose it here
+        // eslint-disable-next-line @typescript-eslint/naming-convention
         device_name: RNDeviceInfo.isEmulatorSync() ? `Emulator - ${prettyName}` : prettyName,
+        // Parameter names are predefined and we don't choose it here
+        // eslint-disable-next-line @typescript-eslint/naming-convention
         os_version: RNDeviceInfo.getSystemVersion(),
     };
-}
+};
+
+export default getOSAndName;
diff --git a/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.ts b/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.ts
new file mode 100644
index 000000000000..d63c2fedc51d
--- /dev/null
+++ b/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.ts
@@ -0,0 +1,12 @@
+import {getOSAndName as libGetOSAndName} from 'expensify-common/lib/Device';
+import GetOSAndName from './types';
+
+const getOSAndName: GetOSAndName = () => {
+    // Parameter names are predefined and we don't choose it here
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    const {device_name, os_version} = libGetOSAndName();
+    // Parameter names are predefined and we don't choose it here
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    return {device_name, os_version};
+};
+export default getOSAndName;
diff --git a/src/libs/actions/Device/getDeviceInfo/getOSAndName/types.ts b/src/libs/actions/Device/getDeviceInfo/getOSAndName/types.ts
new file mode 100644
index 000000000000..2ca67c3c59c3
--- /dev/null
+++ b/src/libs/actions/Device/getDeviceInfo/getOSAndName/types.ts
@@ -0,0 +1,4 @@
+// Parameter names are predefined and we don't choose it here
+// eslint-disable-next-line @typescript-eslint/naming-convention
+type GetOSAndName = () => {device_name: string | undefined; os_version: string | undefined};
+export default GetOSAndName;
diff --git a/src/libs/actions/Download.js b/src/libs/actions/Download.ts
similarity index 63%
rename from src/libs/actions/Download.js
rename to src/libs/actions/Download.ts
index 41e3cb136e3a..06b97d735d39 100644
--- a/src/libs/actions/Download.js
+++ b/src/libs/actions/Download.ts
@@ -1,15 +1,10 @@
-import _ from 'underscore';
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 
 /**
  * Set whether an attachment is being downloaded so that a spinner can be shown.
- *
- * @param {String} sourceID
- * @param {Boolean} isDownloading
- * @returns {Promise}
  */
-function setDownload(sourceID, isDownloading) {
+function setDownload(sourceID: string, isDownloading: boolean): Promise<void> {
     return Onyx.merge(`${ONYXKEYS.COLLECTION.DOWNLOAD}${sourceID}`, {isDownloading});
 }
 
@@ -19,9 +14,12 @@ function clearDownloads() {
         waitForCollectionCallback: true,
         callback: (records) => {
             Onyx.disconnect(connectionID);
-            const downloadsToDelete = {};
-            _.each(_.keys(records), (recordKey) => (downloadsToDelete[recordKey] = null));
-            if (!_.isEmpty(downloadsToDelete)) {
+            const downloadsToDelete: Record<string, null> = {};
+            Object.keys(records ?? {}).forEach((recordKey) => {
+                downloadsToDelete[recordKey] = null;
+            });
+
+            if (Object.keys(downloadsToDelete).length > 0) {
                 Onyx.multiSet(downloadsToDelete);
             }
         },
diff --git a/src/libs/actions/DownloadAppModal.js b/src/libs/actions/DownloadAppModal.js
deleted file mode 100644
index 5dc2d3fdca22..000000000000
--- a/src/libs/actions/DownloadAppModal.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Onyx from 'react-native-onyx';
-import ONYXKEYS from '../../ONYXKEYS';
-
-/**
- * @param {Boolean} shouldShowBanner
- */
-function setShowDownloadAppModal(shouldShowBanner) {
-    Onyx.set(ONYXKEYS.SHOW_DOWNLOAD_APP_BANNER, shouldShowBanner);
-}
-
-export default setShowDownloadAppModal;
diff --git a/src/libs/actions/EmojiPickerAction.js b/src/libs/actions/EmojiPickerAction.js
deleted file mode 100644
index 84621af3a5b4..000000000000
--- a/src/libs/actions/EmojiPickerAction.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import React from 'react';
-
-const emojiPickerRef = React.createRef();
-
-/**
- * Show the EmojiPicker modal popover.
- *
- * @param {Function} [onModalHide=() => {}] - Run a callback when Modal hides.
- * @param {Function} [onEmojiSelected=() => {}] - Run a callback when Emoji selected.
- * @param {Element} emojiPopoverAnchor - Element on which EmojiPicker is anchored
- * @param {Object} [anchorOrigin] - Anchor origin for Popover
- * @param {Function} [onWillShow=() => {}] - Run a callback when Popover will show
- * @param {String} id - Unique id for EmojiPicker
- */
-function showEmojiPicker(onModalHide = () => {}, onEmojiSelected = () => {}, emojiPopoverAnchor, anchorOrigin = undefined, onWillShow = () => {}, id) {
-    if (!emojiPickerRef.current) {
-        return;
-    }
-
-    emojiPickerRef.current.showEmojiPicker(onModalHide, onEmojiSelected, emojiPopoverAnchor, anchorOrigin, onWillShow, id);
-}
-
-/**
- * Hide the Emoji Picker modal.
- *
- * @param {Boolean} isNavigating
- */
-function hideEmojiPicker(isNavigating) {
-    if (!emojiPickerRef.current) {
-        return;
-    }
-    emojiPickerRef.current.hideEmojiPicker(isNavigating);
-}
-
-/**
- * Whether Emoji Picker is active for the given id.
- *
- * @param {String} id
- * @return {Boolean}
- */
-function isActive(id) {
-    if (!emojiPickerRef.current) {
-        return;
-    }
-    return emojiPickerRef.current.isActive(id);
-}
-
-function isEmojiPickerVisible() {
-    if (!emojiPickerRef.current) {
-        return;
-    }
-    return emojiPickerRef.current.isEmojiPickerVisible;
-}
-
-function resetEmojiPopoverAnchor() {
-    if (!emojiPickerRef.current) {
-        return;
-    }
-    return emojiPickerRef.current.resetEmojiPopoverAnchor();
-}
-
-export {emojiPickerRef, showEmojiPicker, hideEmojiPicker, isActive, isEmojiPickerVisible, resetEmojiPopoverAnchor};
diff --git a/src/libs/actions/EmojiPickerAction.ts b/src/libs/actions/EmojiPickerAction.ts
new file mode 100644
index 000000000000..edf82eb46da3
--- /dev/null
+++ b/src/libs/actions/EmojiPickerAction.ts
@@ -0,0 +1,87 @@
+import {ValueOf} from 'type-fest';
+import React from 'react';
+import {View} from 'react-native';
+import CONST from '../../CONST';
+
+type AnchorOrigin = {
+    horizontal: ValueOf<typeof CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL>;
+    vertical: ValueOf<typeof CONST.MODAL.ANCHOR_ORIGIN_VERTICAL>;
+};
+
+// TODO: Move this type to src/components/EmojiPicker/EmojiPicker.js once it is converted to TS
+type EmojiPickerRef = {
+    showEmojiPicker: (onModalHideValue?: () => void, onEmojiSelectedValue?: () => void, emojiPopoverAnchor?: View, anchorOrigin?: AnchorOrigin, onWillShow?: () => void, id?: string) => void;
+    isActive: (id: string) => boolean;
+    clearActive: () => void;
+    hideEmojiPicker: (isNavigating: boolean) => void;
+    isEmojiPickerVisible: boolean;
+    resetEmojiPopoverAnchor: () => void;
+};
+
+const emojiPickerRef = React.createRef<EmojiPickerRef>();
+
+/**
+ * Show the EmojiPicker modal popover.
+ *
+ * @param onModalHide - Run a callback when Modal hides.
+ * @param onEmojiSelected - Run a callback when Emoji selected.
+ * @param emojiPopoverAnchor - Element on which EmojiPicker is anchored
+ * @param anchorOrigin - Anchor origin for Popover
+ * @param onWillShow - Run a callback when Popover will show
+ * @param id - Unique id for EmojiPicker
+ */
+function showEmojiPicker(onModalHide = () => {}, onEmojiSelected = () => {}, emojiPopoverAnchor = undefined, anchorOrigin = undefined, onWillShow = () => {}, id = undefined) {
+    if (!emojiPickerRef.current) {
+        return;
+    }
+
+    emojiPickerRef.current.showEmojiPicker(onModalHide, onEmojiSelected, emojiPopoverAnchor, anchorOrigin, onWillShow, id);
+}
+
+/**
+ * Hide the Emoji Picker modal.
+ */
+function hideEmojiPicker(isNavigating: boolean) {
+    if (!emojiPickerRef.current) {
+        return;
+    }
+
+    emojiPickerRef.current.hideEmojiPicker(isNavigating);
+}
+
+/**
+ * Whether Emoji Picker is active for the given id.
+ */
+function isActive(id: string): boolean {
+    if (!emojiPickerRef.current) {
+        return false;
+    }
+
+    return emojiPickerRef.current.isActive(id);
+}
+
+function clearActive() {
+    if (!emojiPickerRef.current) {
+        return;
+    }
+
+    return emojiPickerRef.current.clearActive();
+}
+
+function isEmojiPickerVisible(): boolean {
+    if (!emojiPickerRef.current) {
+        return false;
+    }
+
+    return emojiPickerRef.current.isEmojiPickerVisible;
+}
+
+function resetEmojiPopoverAnchor() {
+    if (!emojiPickerRef.current) {
+        return;
+    }
+
+    emojiPickerRef.current.resetEmojiPopoverAnchor();
+}
+
+export {emojiPickerRef, showEmojiPicker, hideEmojiPicker, isActive, clearActive, isEmojiPickerVisible, resetEmojiPopoverAnchor};
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 3cbadb8e49bf..198ceb2b8172 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -8,7 +8,6 @@ import ROUTES from '../../ROUTES';
 import ONYXKEYS from '../../ONYXKEYS';
 import Navigation from '../Navigation/Navigation';
 import * as Localize from '../Localize';
-import asyncOpenURL from '../asyncOpenURL';
 import * as API from '../API';
 import * as ReportUtils from '../ReportUtils';
 import * as CurrencyUtils from '../CurrencyUtils';
@@ -22,6 +21,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 +44,27 @@ Onyx.connect({
     },
 });
 
+let allRecentlyUsedCategories = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES,
+    waitForCollectionCallback: true,
+    callback: (val) => (allRecentlyUsedCategories = val),
+});
+
+let allRecentlyUsedTags = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS,
+    waitForCollectionCallback: true,
+    callback: (value) => {
+        if (!value) {
+            allRecentlyUsedTags = {};
+            return;
+        }
+
+        allRecentlyUsedTags = value;
+    },
+});
+
 let userAccountID = '';
 let currentUserEmail = '';
 Onyx.connect({
@@ -54,11 +75,29 @@ Onyx.connect({
     },
 });
 
+let didInitCurrency = false;
+Onyx.connect({
+    key: ONYXKEYS.IOU,
+    callback: (val) => {
+        didInitCurrency = lodashGet(val, 'didInitCurrency');
+    },
+});
+
+let shouldResetIOUAfterLogin = true;
 let currentUserPersonalDetails = {};
 Onyx.connect({
     key: ONYXKEYS.PERSONAL_DETAILS_LIST,
     callback: (val) => {
         currentUserPersonalDetails = lodashGet(val, userAccountID, {});
+        if (!val || !shouldResetIOUAfterLogin || didInitCurrency) {
+            return;
+        }
+        // eslint-disable-next-line no-use-before-define
+        resetMoneyRequestInfo();
+        shouldResetIOUAfterLogin = false;
+        Onyx.merge(ONYXKEYS.IOU, {
+            didInitCurrency: true,
+        });
     },
 });
 
@@ -83,10 +122,13 @@ function resetMoneyRequestInfo(id = '') {
         comment: '',
         participants: [],
         merchant: CONST.TRANSACTION.DEFAULT_MERCHANT,
+        category: '',
+        tag: '',
         created,
         receiptPath: '',
         receiptSource: '',
         transactionID: '',
+        billable: null,
     });
 }
 
@@ -99,6 +141,8 @@ function buildOnyxDataForMoneyRequest(
     iouAction,
     optimisticPersonalDetailListAction,
     reportPreviewAction,
+    optimisticRecentlyUsedCategories,
+    optimisticPolicyRecentlyUsedTags,
     isNewChatReport,
     isNewIOUReport,
 ) {
@@ -148,6 +192,22 @@ function buildOnyxDataForMoneyRequest(
         },
     ];
 
+    if (!_.isEmpty(optimisticRecentlyUsedCategories)) {
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${iouReport.policyID}`,
+            value: optimisticRecentlyUsedCategories,
+        });
+    }
+
+    if (!_.isEmpty(optimisticPolicyRecentlyUsedTags)) {
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS}${iouReport.policyID}`,
+            value: optimisticPolicyRecentlyUsedTags,
+        });
+    }
+
     if (!_.isEmpty(optimisticPersonalDetailListAction)) {
         optimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
@@ -319,6 +379,10 @@ function buildOnyxDataForMoneyRequest(
  * @param {Number} [payeeAccountID]
  * @param {String} [payeeEmail]
  * @param {Object} [receipt]
+ * @param {String} [existingTransactionID]
+ * @param {String} [category]
+ * @param {String} [tag]
+ * @param {Boolean} [billable]
  * @returns {Object} data
  * @returns {String} data.payerEmail
  * @returns {Object} data.iouReport
@@ -332,7 +396,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 +408,10 @@ function getMoneyRequestInformation(
     payeeAccountID = userAccountID,
     payeeEmail = currentUserEmail,
     receipt = undefined,
-    existingTransactionID = null,
+    existingTransactionID = undefined,
+    category = undefined,
+    tag = undefined,
+    billable = undefined,
 ) {
     const payerEmail = OptionsListUtils.addSMSDomainIfPhoneNumber(participant.login);
     const payerAccountID = Number(participant.accountID);
@@ -410,8 +476,29 @@ function getMoneyRequestInformation(
         receiptObject,
         filename,
         existingTransactionID,
+        category,
+        tag,
+        billable,
     );
 
+    const uniquePolicyRecentlyUsedCategories = allRecentlyUsedCategories
+        ? _.filter(
+              allRecentlyUsedCategories[`${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${iouReport.policyID}`],
+              (recentlyUsedPolicyCategory) => recentlyUsedPolicyCategory !== category,
+          )
+        : [];
+    const optimisticPolicyRecentlyUsedCategories = [category, ...uniquePolicyRecentlyUsedCategories];
+
+    const optimisticPolicyRecentlyUsedTags = {};
+    const recentlyUsedPolicyTags = allRecentlyUsedTags[`${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS}${iouReport.policyID}`];
+
+    if (recentlyUsedPolicyTags) {
+        // For now it only uses the first tag of the policy, since multi-tags are not yet supported
+        const recentlyUsedTagListKey = _.first(_.keys(recentlyUsedPolicyTags));
+        const uniquePolicyRecentlyUsedTags = _.filter(recentlyUsedPolicyTags[recentlyUsedTagListKey], (recentlyUsedPolicyTag) => recentlyUsedPolicyTag !== tag);
+        optimisticPolicyRecentlyUsedTags[recentlyUsedTagListKey] = [tag, ...uniquePolicyRecentlyUsedTags];
+    }
+
     // 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.
@@ -449,9 +536,13 @@ function getMoneyRequestInformation(
 
     let reportPreviewAction = isNewIOUReport ? null : ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID);
     if (reportPreviewAction) {
-        reportPreviewAction = ReportUtils.updateReportPreview(iouReport, reportPreviewAction, comment, optimisticTransaction);
+        reportPreviewAction = ReportUtils.updateReportPreview(iouReport, reportPreviewAction, false, comment, optimisticTransaction);
     } else {
         reportPreviewAction = ReportUtils.buildOptimisticReportPreview(chatReport, iouReport, comment, optimisticTransaction);
+
+        // Generated ReportPreview action is a parent report action of the iou report.
+        // We are setting the iou report's parentReportActionID to display subtitle correctly in IOU page when offline.
+        iouReport.parentReportActionID = reportPreviewAction.reportActionID;
     }
 
     // Add optimistic personal details for participant
@@ -460,8 +551,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;
@@ -476,11 +567,14 @@ function getMoneyRequestInformation(
         iouAction,
         optimisticPersonalDetailListAction,
         reportPreviewAction,
+        optimisticPolicyRecentlyUsedCategories,
+        optimisticPolicyRecentlyUsedTags,
         isNewChatReport,
         isNewIOUReport,
     );
 
     return {
+        payerAccountID,
         payerEmail,
         iouReport,
         chatReport,
@@ -505,11 +599,14 @@ function getMoneyRequestInformation(
  * @param {String} comment
  * @param {String} created
  * @param {String} [transactionID]
+ * @param {String} [category]
+ * @param {String} [tag]
  * @param {Number} amount
  * @param {String} currency
  * @param {String} merchant
+ * @param {Boolean} [billable]
  */
-function createDistanceRequest(report, participant, comment, created, transactionID, amount, currency, merchant) {
+function createDistanceRequest(report, participant, comment, created, transactionID, category, tag, amount, currency, merchant, billable) {
     const optimisticReceipt = {
         source: ReceiptGeneric,
         state: CONST.IOU.RECEIPT_STATE.OPEN,
@@ -522,10 +619,13 @@ function createDistanceRequest(report, participant, comment, created, transactio
         currency,
         created,
         merchant,
-        null,
-        null,
+        userAccountID,
+        currentUserEmail,
         optimisticReceipt,
         transactionID,
+        category,
+        tag,
+        billable,
     );
     API.write(
         'CreateDistanceRequest',
@@ -540,6 +640,9 @@ function createDistanceRequest(report, participant, comment, created, transactio
             reportPreviewReportActionID: reportPreviewAction.reportActionID,
             waypoints: JSON.stringify(TransactionUtils.getValidWaypoints(transaction.comment.waypoints, true)),
             created,
+            category,
+            tag,
+            billable,
         },
         onyxData,
     );
@@ -547,6 +650,154 @@ function createDistanceRequest(report, participant, comment, created, transactio
     Report.notifyNewAction(chatReport.reportID, userAccountID);
 }
 
+/**
+ * Edits an existing distance request
+ *
+ * @param {String} transactionID
+ * @param {Number} transactionThreadReportID
+ * @param {Object} transactionChanges
+ * @param {String} [transactionChanges.created]
+ * @param {Number} [transactionChanges.amount]
+ * @param {Object} [transactionChanges.comment]
+ * @param {Object} [transactionChanges.waypoints]
+ *
+ */
+function updateDistanceRequest(transactionID, transactionThreadReportID, transactionChanges) {
+    const optimisticData = [];
+    const successData = [];
+    const failureData = [];
+
+    // Step 1: Set any "pending fields" (ones updated while the user was offline) to have error messages in the failureData
+    const pendingFields = _.mapObject(transactionChanges, () => CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+    const clearedPendingFields = _.mapObject(transactionChanges, () => null);
+    const errorFields = _.mapObject(pendingFields, () => ({
+        [DateUtils.getMicroseconds()]: Localize.translateLocal('iou.error.genericEditFailureMessage'),
+    }));
+
+    // Step 2: Get all the collections being updated
+    const transactionThread = allReports[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`];
+    const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
+    const iouReport = allReports[`${ONYXKEYS.COLLECTION.REPORT}${transactionThread.parentReportID}`];
+    const isFromExpenseReport = ReportUtils.isExpenseReport(iouReport);
+    const updatedTransaction = TransactionUtils.getUpdatedTransaction(transaction, transactionChanges, isFromExpenseReport);
+    const transactionDetails = ReportUtils.getTransactionDetails(updatedTransaction);
+
+    const params = {
+        ...transactionDetails,
+        transactionID,
+        // This needs to be a JSON string since we're sending this to the MapBox API
+        waypoints: JSON.stringify(transactionDetails.waypoints),
+    };
+
+    // Step 3: Build the modified expense report actions
+    // We don't create a modified report action if we're updating the waypoints,
+    // since there isn't actually any optimistic data we can create for them and the report action is created on the server
+    // with the response from the MapBox API
+    if (!_.has(transactionChanges, 'waypoints')) {
+        const updatedReportAction = ReportUtils.buildOptimisticModifiedExpenseReportAction(transactionThread, transaction, transactionChanges, isFromExpenseReport);
+        params.reportActionID = updatedReportAction.reportActionID;
+
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThread.reportID}`,
+            value: {
+                [updatedReportAction.reportActionID]: updatedReportAction,
+            },
+        });
+        successData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThread.reportID}`,
+            value: {
+                [updatedReportAction.reportActionID]: {pendingAction: null},
+            },
+        });
+        failureData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThread.reportID}`,
+            value: {
+                [updatedReportAction.reportActionID]: updatedReportAction,
+            },
+        });
+
+        // Step 4: Compute the IOU total and update the report preview message (and report header) 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};
+        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);
+            optimisticData.push({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+                value: updatedMoneyRequestReport,
+            });
+            successData.push({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+                value: {pendingAction: null},
+            });
+        }
+    }
+
+    // Optimistically modify the transaction
+    optimisticData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+        value: {
+            ...updatedTransaction,
+            pendingFields,
+            isLoading: _.has(transactionChanges, 'waypoints'),
+            errorFields: null,
+        },
+    });
+
+    // Clear out the error fields and loading states on success
+    successData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+        value: {
+            pendingFields: clearedPendingFields,
+            isLoading: false,
+            errorFields: null,
+        },
+    });
+
+    if (_.has(transactionChanges, 'waypoints')) {
+        // Delete the backup transaction when editing waypoints when the server responds successfully and there are no errors
+        successData.push({
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}-backup`,
+            value: null,
+        });
+    }
+
+    // Clear out loading states, pending fields, and add the error fields
+    failureData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+        value: {
+            pendingFields: clearedPendingFields,
+            isLoading: false,
+            errorFields,
+        },
+    });
+
+    // Reset the iouReport to it's original state
+    failureData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+        value: iouReport,
+    });
+
+    API.write('UpdateDistanceRequest', params, {optimisticData, successData, failureData});
+}
+
 /**
  * Request money from another user
  *
@@ -560,25 +811,36 @@ function createDistanceRequest(report, participant, comment, created, transactio
  * @param {Object} participant
  * @param {String} comment
  * @param {Object} [receipt]
+ * @param {String} [category]
+ * @param {String} [tag]
+ * @param {Boolean} [billable]
  */
-function requestMoney(report, amount, currency, created, merchant, payeeEmail, payeeAccountID, participant, comment, receipt = undefined) {
-    const {payerEmail, iouReport, chatReport, transaction, iouAction, createdChatReportActionID, createdIOUReportActionID, reportPreviewAction, onyxData} = getMoneyRequestInformation(
-        report,
-        participant,
-        comment,
-        amount,
-        currency,
-        created,
-        merchant,
-        payeeAccountID,
-        payeeEmail,
-        receipt,
-    );
+function requestMoney(
+    report,
+    amount,
+    currency,
+    created,
+    merchant,
+    payeeEmail,
+    payeeAccountID,
+    participant,
+    comment,
+    receipt = undefined,
+    category = undefined,
+    tag = undefined,
+    billable = undefined,
+) {
+    // If the report is iou or expense report, we should get the linked chat report to be passed to the getMoneyRequestInformation function
+    const isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
+    const currentChatReport = isMoneyRequestReport ? ReportUtils.getReport(report.chatReportID) : report;
+    const {payerAccountID, payerEmail, iouReport, chatReport, transaction, iouAction, createdChatReportActionID, createdIOUReportActionID, reportPreviewAction, onyxData} =
+        getMoneyRequestInformation(currentChatReport, participant, comment, amount, currency, created, merchant, payeeAccountID, payeeEmail, receipt, undefined, category, tag, billable);
 
     API.write(
         'RequestMoney',
         {
             debtorEmail: payerEmail,
+            debtorAccountID: payerAccountID,
             amount,
             currency,
             comment,
@@ -592,11 +854,15 @@ function requestMoney(report, amount, currency, created, merchant, payeeEmail, p
             createdIOUReportActionID,
             reportPreviewReportActionID: reportPreviewAction.reportActionID,
             receipt,
+            receiptState: lodashGet(receipt, 'state'),
+            category,
+            tag,
+            billable,
         },
         onyxData,
     );
     resetMoneyRequestInfo();
-    Navigation.dismissModal(chatReport.reportID);
+    Navigation.dismissModal(isMoneyRequestReport ? report.reportID : chatReport.reportID);
     Report.notifyNewAction(chatReport.reportID, payeeAccountID);
 }
 
@@ -624,9 +890,10 @@ function requestMoney(report, amount, currency, created, merchant, payeeEmail, p
 function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingSplitChatReportID = '') {
     const currentUserEmailForIOUSplit = OptionsListUtils.addSMSDomainIfPhoneNumber(currentUserLogin);
     const participantAccountIDs = _.map(participants, (participant) => Number(participant.accountID));
-    const existingSplitChatReport = existingSplitChatReportID
-        ? allReports[`${ONYXKEYS.COLLECTION.REPORT}${existingSplitChatReportID}`]
-        : ReportUtils.getChatByParticipants(participantAccountIDs);
+    const existingSplitChatReport =
+        existingSplitChatReportID || participants[0].reportID
+            ? allReports[`${ONYXKEYS.COLLECTION.REPORT}${existingSplitChatReportID || participants[0].reportID}`]
+            : ReportUtils.getChatByParticipants(participantAccountIDs);
     const splitChatReport = existingSplitChatReport || ReportUtils.buildOptimisticChatReport(participantAccountIDs);
     const isOwnPolicyExpenseChat = splitChatReport.isOwnPolicyExpenseChat;
 
@@ -851,8 +1118,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;
@@ -874,6 +1141,8 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
             oneOnOneIOUAction,
             oneOnOnePersonalDetailListAction,
             oneOnOneReportPreviewAction,
+            [],
+            {},
             isNewOneOnOneChatReport,
             shouldCreateNewOneOnOneIOUReport,
         );
@@ -970,6 +1239,7 @@ function splitBillAndOpenReport(participants, currentUserLogin, currentUserAccou
             transactionID: splitData.transactionID,
             reportActionID: splitData.reportActionID,
             createdReportActionID: splitData.createdReportActionID,
+            policyID: splitData.policyID,
         },
         onyxData,
     );
@@ -989,13 +1259,63 @@ function editMoneyRequest(transactionID, transactionThreadReportID, transactionC
     const transactionThread = allReports[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`];
     const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
     const iouReport = allReports[`${ONYXKEYS.COLLECTION.REPORT}${transactionThread.parentReportID}`];
+    const chatReport = allReports[`${ONYXKEYS.COLLECTION.REPORT}${iouReport.chatReportID}`];
     const isFromExpenseReport = ReportUtils.isExpenseReport(iouReport);
 
     // STEP 2: Build new modified expense report action.
     const updatedReportAction = ReportUtils.buildOptimisticModifiedExpenseReportAction(transactionThread, transaction, transactionChanges, isFromExpenseReport);
     const updatedTransaction = TransactionUtils.getUpdatedTransaction(transaction, transactionChanges, isFromExpenseReport);
+
     // STEP 3: Compute the IOU total and update the report preview message so LHN amount owed is correct
+    // Should only update if the transaction matches the currency of the report, else we wait for the update
+    // from the server with the currency conversion
+    let updatedMoneyRequestReport = {...iouReport};
+    const updatedChatReport = {...chatReport};
+    const diff = TransactionUtils.getAmount(transaction, true) - TransactionUtils.getAmount(updatedTransaction, true);
+    if (updatedTransaction.currency === iouReport.currency && updatedTransaction.modifiedAmount && diff !== 0) {
+        if (ReportUtils.isExpenseReport(iouReport)) {
+            updatedMoneyRequestReport.total += diff;
+        } else {
+            updatedMoneyRequestReport = IOUUtils.updateIOUOwnerAndTotal(iouReport, updatedReportAction.actorAccountID, diff, TransactionUtils.getCurrency(transaction), false);
+        }
+
+        updatedMoneyRequestReport.cachedTotal = CurrencyUtils.convertToDisplayString(updatedMoneyRequestReport.total, updatedTransaction.currency);
+
+        // Update the last message of the IOU report
+        const lastMessage = ReportUtils.getIOUReportActionMessage(
+            iouReport.reportID,
+            CONST.IOU.REPORT_ACTION_TYPE.CREATE,
+            updatedMoneyRequestReport.total,
+            '',
+            updatedTransaction.currency,
+            '',
+            false,
+        );
+        updatedMoneyRequestReport.lastMessageText = lastMessage[0].text;
+        updatedMoneyRequestReport.lastMessageHtml = lastMessage[0].html;
+
+        // Update the last message of the chat report
+        const messageText = Localize.translateLocal('iou.payerOwesAmount', {
+            payer: updatedMoneyRequestReport.managerEmail,
+            amount: CurrencyUtils.convertToDisplayString(updatedMoneyRequestReport.total, updatedMoneyRequestReport.currency),
+        });
+        updatedChatReport.lastMessageText = messageText;
+        updatedChatReport.lastMessageHtml = messageText;
+    }
+
+    const optimisticPolicyRecentlyUsedTags = {};
+    if (_.has(transactionChanges, 'tag')) {
+        const tagListName = transactionChanges.tagListName;
+        const recentlyUsedPolicyTags = allRecentlyUsedTags[`${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS}${iouReport.policyID}`];
+
+        if (recentlyUsedPolicyTags) {
+            const uniquePolicyRecentlyUsedTags = _.filter(recentlyUsedPolicyTags[tagListName], (recentlyUsedPolicyTag) => recentlyUsedPolicyTag !== transactionChanges.tag);
+            optimisticPolicyRecentlyUsedTags[tagListName] = [transactionChanges.tag, ...uniquePolicyRecentlyUsedTags];
+        }
+    }
+
     // STEP 4: Compose the optimistic data
+    const currentTime = DateUtils.getDBTime();
     const optimisticData = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -1009,8 +1329,34 @@ 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,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`,
+            value: {
+                lastReadTime: currentTime,
+                lastVisibleActionCreated: currentTime,
+            },
+        },
     ];
 
+    if (!_.isEmpty(optimisticPolicyRecentlyUsedTags)) {
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS}${iouReport.policyID}`,
+            value: optimisticPolicyRecentlyUsedTags,
+        });
+    }
+
     const successData = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -1029,9 +1375,17 @@ function editMoneyRequest(transactionID, transactionThreadReportID, transactionC
                     created: null,
                     currency: null,
                     merchant: null,
+                    billable: null,
+                    category: null,
+                    tag: null,
                 },
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+            value: {pendingAction: null},
+        },
     ];
 
     const failureData = [
@@ -1039,7 +1393,9 @@ function editMoneyRequest(transactionID, transactionThreadReportID, transactionC
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThread.reportID}`,
             value: {
-                [updatedReportAction.reportActionID]: updatedReportAction,
+                [updatedReportAction.reportActionID]: {
+                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericEditFailureMessage'),
+                },
             },
         },
         {
@@ -1049,13 +1405,26 @@ 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,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`,
+            value: {
+                lastReadTime: transactionThread.lastReadTime,
+                lastVisibleActionCreated: transactionThread.lastVisibleActionCreated,
+            },
+        },
     ];
 
     // STEP 6: Call the API endpoint
-    const {created, amount, currency, comment, merchant} = ReportUtils.getTransactionDetails(updatedTransaction);
+    const {created, amount, currency, comment, merchant, category, billable, tag} = ReportUtils.getTransactionDetails(updatedTransaction);
     API.write(
         'EditMoneyRequest',
         {
@@ -1066,6 +1435,9 @@ function editMoneyRequest(transactionID, transactionThreadReportID, transactionC
             currency,
             comment,
             merchant,
+            category,
+            billable,
+            tag,
         },
         {optimisticData, successData, failureData},
     );
@@ -1279,28 +1651,18 @@ function deleteMoneyRequest(transactionID, reportAction, isSingleTransactionView
     // STEP 7: Navigate the user depending on which page they are on and which resources were deleted
     if (isSingleTransactionView && shouldDeleteTransactionThread && !shouldDeleteIOUReport) {
         // Pop the deleted report screen before navigating. This prevents navigating to the Concierge chat due to the missing report.
-        Navigation.goBack();
-        Navigation.navigate(ROUTES.getReportRoute(iouReport.reportID));
+        Navigation.goBack(ROUTES.HOME);
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(iouReport.reportID));
         return;
     }
 
     if (shouldDeleteIOUReport) {
         // Pop the deleted report screen before navigating. This prevents navigating to the Concierge chat due to the missing report.
-        Navigation.goBack();
-        Navigation.navigate(ROUTES.getReportRoute(iouReport.chatReportID));
+        Navigation.goBack(ROUTES.HOME);
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(iouReport.chatReportID));
     }
 }
 
-/**
- * @param {Number} amount
- * @param {String} submitterPayPalMeAddress
- * @param {String} currency
- * @returns {String}
- */
-function buildPayPalPaymentUrl(amount, submitterPayPalMeAddress, currency) {
-    return `https://paypal.me/${submitterPayPalMeAddress}/${Math.abs(amount) / 100}${currency}`;
-}
-
 /**
  * @param {Object} report
  * @param {Number} amount
@@ -1543,7 +1905,7 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
     let optimisticReportPreviewAction = null;
     const reportPreviewAction = ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID);
     if (reportPreviewAction) {
-        optimisticReportPreviewAction = ReportUtils.updateReportPreview(iouReport, reportPreviewAction);
+        optimisticReportPreviewAction = ReportUtils.updateReportPreview(iouReport, reportPreviewAction, true);
     }
 
     const optimisticData = [
@@ -1681,26 +2043,6 @@ function sendMoneyWithWallet(report, amount, currency, comment, managerID, recip
     Report.notifyNewAction(params.chatReportID, managerID);
 }
 
-/**
- * @param {Object} report
- * @param {Number} amount
- * @param {String} currency
- * @param {String} comment
- * @param {String} managerID - Account ID of the person sending the money
- * @param {Object} recipient - The user receiving the money
- */
-function sendMoneyViaPaypal(report, amount, currency, comment, managerID, recipient) {
-    const {params, optimisticData, successData, failureData} = getSendMoneyParams(report, amount, currency, comment, CONST.IOU.PAYMENT_TYPE.PAYPAL_ME, managerID, recipient);
-
-    API.write('SendMoneyViaPaypal', params, {optimisticData, successData, failureData});
-
-    resetMoneyRequestInfo();
-    Navigation.dismissModal(params.chatReportID);
-    Report.notifyNewAction(params.chatReportID, managerID);
-
-    asyncOpenURL(Promise.resolve(), buildPayPalPaymentUrl(amount, recipient.payPalMeAddress, currency));
-}
-
 function approveMoneyRequest(expenseReport) {
     const optimisticApprovedReportAction = ReportUtils.buildOptimisticApprovedReportAction(expenseReport.total, expenseReport.currency, expenseReport.reportID);
 
@@ -1764,7 +2106,6 @@ function payMoneyRequest(paymentType, chatReport, iouReport) {
     const recipient = {
         login: iouReport.ownerEmail,
         accountID: iouReport.ownerAccountID,
-        payPalMeAddress: iouReport.submitterPayPalMeAddress,
     };
     const {params, optimisticData, successData, failureData} = getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentType);
 
@@ -1774,9 +2115,43 @@ function payMoneyRequest(paymentType, chatReport, iouReport) {
 
     API.write(apiCommand, params, {optimisticData, successData, failureData});
     Navigation.dismissModal(chatReport.reportID);
-    if (paymentType === CONST.IOU.PAYMENT_TYPE.PAYPAL_ME) {
-        asyncOpenURL(Promise.resolve(), buildPayPalPaymentUrl(iouReport.total, recipient.payPalMeAddress, iouReport.currency));
-    }
+}
+
+/**
+ * @param {String} transactionID
+ * @param {Object} receipt
+ * @param {String} filePath
+ */
+function replaceReceipt(transactionID, receipt, filePath) {
+    const transaction = lodashGet(allTransactions, 'transactionID', {});
+    const oldReceipt = lodashGet(transaction, 'receipt', {});
+
+    const optimisticData = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+            value: {
+                receipt: {
+                    source: filePath,
+                    state: CONST.IOU.RECEIPT_STATE.OPEN,
+                },
+                filename: receipt.name,
+            },
+        },
+    ];
+
+    const failureData = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+            value: {
+                receipt: oldReceipt,
+                filename: transaction.filename,
+            },
+        },
+    ];
+
+    API.write('ReplaceReceipt', {transactionID, receipt}, {optimisticData, failureData});
 }
 
 /**
@@ -1786,7 +2161,7 @@ function payMoneyRequest(paymentType, chatReport, iouReport) {
  */
 function startMoneyRequest(iouType, reportID = '') {
     resetMoneyRequestInfo(`${iouType}${reportID}`);
-    Navigation.navigate(ROUTES.getMoneyRequestRoute(iouType, reportID));
+    Navigation.navigate(ROUTES.MONEY_REQUEST.getRoute(iouType, reportID));
 }
 
 /**
@@ -1831,6 +2206,35 @@ 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 {String} tag
+ */
+function setMoneyRequestTag(tag) {
+    Onyx.merge(ONYXKEYS.IOU, {tag});
+}
+
+function resetMoneyRequestTag() {
+    Onyx.merge(ONYXKEYS.IOU, {tag: ''});
+}
+
+/**
+ * @param {Boolean} billable
+ */
+function setMoneyRequestBillable(billable) {
+    Onyx.merge(ONYXKEYS.IOU, {billable});
+}
+
 /**
  * @param {Object[]} participants
  */
@@ -1857,11 +2261,12 @@ function createEmptyTransaction() {
  *
  * @param {Object} iou
  * @param {String} iouType
- * @param {String} reportID
  * @param {Object} report
+ * @param {String} report.reportID
+ * @param {String} path
  */
-function navigateToNextPage(iou, iouType, reportID, report) {
-    const moneyRequestID = `${iouType}${reportID}`;
+function navigateToNextPage(iou, iouType, report, path = '') {
+    const moneyRequestID = `${iouType}${report.reportID || ''}`;
     const shouldReset = iou.id !== moneyRequestID;
 
     // If the money request ID in Onyx does not match the ID from params, we want to start a new request
@@ -1870,23 +2275,31 @@ function navigateToNextPage(iou, iouType, reportID, report) {
         resetMoneyRequestInfo(moneyRequestID);
     }
 
+    // If we're adding a receipt, that means the user came from the confirmation page and we need to navigate back to it.
+    if (path.slice(1) === ROUTES.MONEY_REQUEST_RECEIPT.getRoute(iouType, report.reportID)) {
+        Navigation.navigate(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(iouType, report.reportID));
+        return;
+    }
+
     // 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();
             setMoneyRequestParticipants(participants);
         }
-        Navigation.navigate(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
+        Navigation.navigate(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(iouType, report.reportID));
         return;
     }
-    Navigation.navigate(ROUTES.getMoneyRequestParticipantsRoute(iouType));
+    Navigation.navigate(ROUTES.MONEY_REQUEST_PARTICIPANTS.getRoute(iouType));
 }
 
 export {
@@ -1897,7 +2310,6 @@ export {
     splitBillAndOpenReport,
     requestMoney,
     sendMoneyElsewhere,
-    sendMoneyViaPaypal,
     approveMoneyRequest,
     payMoneyRequest,
     sendMoneyWithWallet,
@@ -1909,8 +2321,15 @@ export {
     setMoneyRequestCurrency,
     setMoneyRequestDescription,
     setMoneyRequestMerchant,
+    setMoneyRequestCategory,
+    resetMoneyRequestCategory,
+    setMoneyRequestTag,
+    resetMoneyRequestTag,
+    setMoneyRequestBillable,
     setMoneyRequestParticipants,
     setMoneyRequestReceipt,
     createEmptyTransaction,
     navigateToNextPage,
+    updateDistanceRequest,
+    replaceReceipt,
 };
diff --git a/src/libs/actions/MapboxToken.js b/src/libs/actions/MapboxToken.js
index e1e643d0eabc..e5824ef0302d 100644
--- a/src/libs/actions/MapboxToken.js
+++ b/src/libs/actions/MapboxToken.js
@@ -46,11 +46,15 @@ const hasTokenExpired = () => moment().isAfter(currentToken.expiration);
 
 const clearToken = () => {
     console.debug('[MapboxToken] Deleting the token stored in Onyx');
-
     // Use Onyx.set() to delete the key from Onyx, which will trigger a new token to be retrieved from the API.
     Onyx.set(ONYXKEYS.MAPBOX_ACCESS_TOKEN, null);
 };
 
+const fetchToken = () => {
+    API.read('GetMapboxAccessToken');
+    isCurrentlyFetchingToken = true;
+};
+
 const init = () => {
     if (connectionIDForToken) {
         console.debug('[MapboxToken] init() is already listening to Onyx so returning early');
@@ -83,9 +87,7 @@ const init = () => {
             // If the token is falsy or an empty object, the token needs to be retrieved from the API.
             // The API sets a token in Onyx with a 30 minute expiration.
             if (_.isEmpty(token)) {
-                console.debug('[MapboxToken] Token does not exist so fetching one');
-                API.read('GetMapboxAccessToken');
-                isCurrentlyFetchingToken = true;
+                fetchToken();
                 return;
             }
 
@@ -126,9 +128,13 @@ const init = () => {
             callback: (val) => {
                 // When the network reconnects, check if the token has expired. If it has, then clearing the token will
                 // trigger the fetch of a new one
-                if (network && network.isOffline && val && !val.isOffline && !isCurrentlyFetchingToken && hasTokenExpired()) {
-                    console.debug('[MapboxToken] Token is expired after network came online');
-                    clearToken();
+                if (network && network.isOffline && val && !val.isOffline) {
+                    if (_.isEmpty(currentToken)) {
+                        fetchToken();
+                    } else if (!isCurrentlyFetchingToken && hasTokenExpired()) {
+                        console.debug('[MapboxToken] Token is expired after network came online');
+                        clearToken();
+                    }
                 }
                 network = val;
             },
@@ -140,12 +146,15 @@ const stop = () => {
     console.debug('[MapboxToken] Stopping all listeners and timers');
     if (connectionIDForToken) {
         Onyx.disconnect(connectionIDForToken);
+        connectionIDForToken = null;
     }
     if (connectionIDForNetwork) {
         Onyx.disconnect(connectionIDForNetwork);
+        connectionIDForNetwork = null;
     }
     if (appStateSubscription) {
         appStateSubscription.remove();
+        appStateSubscription = null;
     }
     clearTimeout(refreshTimeoutID);
 };
diff --git a/src/libs/actions/Modal.js b/src/libs/actions/Modal.ts
similarity index 74%
rename from src/libs/actions/Modal.js
rename to src/libs/actions/Modal.ts
index ea3bfc351593..ff09731f59a7 100644
--- a/src/libs/actions/Modal.js
+++ b/src/libs/actions/Modal.ts
@@ -1,25 +1,20 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 
-let closeModal;
-let onModalClose;
+let closeModal: (isNavigating: boolean) => void;
+let onModalClose: null | (() => void);
 
 /**
  * Allows other parts of the app to call modal close function
- *
- * @param {Function} [onClose]
  */
-function setCloseModal(onClose) {
+function setCloseModal(onClose: () => void) {
     closeModal = onClose;
 }
 
 /**
  * Close modal in other parts of the app
- *
- * @param {Function} [onModalCloseCallback]
- * @param {Boolean} isNavigating
  */
-function close(onModalCloseCallback, isNavigating = true) {
+function close(onModalCloseCallback: () => void, isNavigating = true) {
     if (!closeModal) {
         // If modal is already closed, no need to wait for modal close. So immediately call callback.
         if (onModalCloseCallback) {
@@ -42,20 +37,16 @@ function onModalDidClose() {
 
 /**
  * Allows other parts of the app to know when a modal has been opened or closed
- *
- * @param {Boolean} isVisible
  */
-function setModalVisibility(isVisible) {
+function setModalVisibility(isVisible: boolean) {
     Onyx.merge(ONYXKEYS.MODAL, {isVisible});
 }
 
 /**
  * Allows other parts of app to know that an alert modal is about to open.
  * This will trigger as soon as a modal is opened but not yet visible while animation is running.
- *
- * @param {Boolean} isVisible
  */
-function willAlertModalBecomeVisible(isVisible) {
+function willAlertModalBecomeVisible(isVisible: boolean) {
     Onyx.merge(ONYXKEYS.MODAL, {willAlertModalBecomeVisible: isVisible});
 }
 
diff --git a/src/libs/actions/Network.js b/src/libs/actions/Network.ts
similarity index 58%
rename from src/libs/actions/Network.js
rename to src/libs/actions/Network.ts
index 892ba92f6973..212e44f6782d 100644
--- a/src/libs/actions/Network.js
+++ b/src/libs/actions/Network.ts
@@ -1,26 +1,18 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 
-/**
- * @param {Boolean} isOffline
- */
-function setIsOffline(isOffline) {
+function setIsOffline(isOffline: boolean) {
     Onyx.merge(ONYXKEYS.NETWORK, {isOffline});
 }
 
-/**
- *
- * @param {Boolean} shouldForceOffline
- */
-function setShouldForceOffline(shouldForceOffline) {
+function setShouldForceOffline(shouldForceOffline: boolean) {
     Onyx.merge(ONYXKEYS.NETWORK, {shouldForceOffline});
 }
 
 /**
  * Test tool that will fail all network requests when enabled
- * @param {Boolean} shouldFailAllRequests
  */
-function setShouldFailAllRequests(shouldFailAllRequests) {
+function setShouldFailAllRequests(shouldFailAllRequests: boolean) {
     Onyx.merge(ONYXKEYS.NETWORK, {shouldFailAllRequests});
 }
 
diff --git a/src/libs/actions/OnyxUpdateManager.js b/src/libs/actions/OnyxUpdateManager.js
index f0051b85f302..b6318b784439 100644
--- a/src/libs/actions/OnyxUpdateManager.js
+++ b/src/libs/actions/OnyxUpdateManager.js
@@ -1,9 +1,11 @@
 import Onyx from 'react-native-onyx';
+import _ from 'underscore';
 import ONYXKEYS from '../../ONYXKEYS';
 import Log from '../Log';
 import * as SequentialQueue from '../Network/SequentialQueue';
 import * as App from './App';
 import * as OnyxUpdates from './OnyxUpdates';
+import CONST from '../../CONST';
 
 // This file is in charge of looking at the updateIDs coming from the server and comparing them to the last updateID that the client has.
 // If the client is behind the server, then we need to
@@ -35,6 +37,19 @@ export default () => {
                 return;
             }
 
+            // Since we used the same key that used to store another object, let's confirm that the current object is
+            // following the new format before we proceed. If it isn't, then let's clear the object in Onyx.
+            if (
+                !_.isObject(val) ||
+                !_.has(val, 'type') ||
+                (!(val.type === CONST.ONYX_UPDATE_TYPES.HTTPS && _.has(val, 'request') && _.has(val, 'response')) && !(val.type === CONST.ONYX_UPDATE_TYPES.PUSHER && _.has(val, 'updates')))
+            ) {
+                console.debug('[OnyxUpdateManager] Invalid format found for updates, cleaning and unpausing the queue');
+                Onyx.set(ONYXKEYS.ONYX_UPDATES_FROM_SERVER, null);
+                SequentialQueue.unpause();
+                return;
+            }
+
             const updateParams = val;
             const lastUpdateIDFromServer = val.lastUpdateID;
             const previousUpdateIDFromServer = val.previousUpdateID;
@@ -73,6 +88,7 @@ export default () => {
             canUnpauseQueuePromise.finally(() => {
                 OnyxUpdates.apply(updateParams).finally(() => {
                     console.debug('[OnyxUpdateManager] Done applying all updates');
+                    Onyx.set(ONYXKEYS.ONYX_UPDATES_FROM_SERVER, null);
                     SequentialQueue.unpause();
                 });
             });
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..39a20ae9362a 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 === null || 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/PaymentMethods.js b/src/libs/actions/PaymentMethods.js
index 95148c1d4367..0ed6f8b036bb 100644
--- a/src/libs/actions/PaymentMethods.js
+++ b/src/libs/actions/PaymentMethods.js
@@ -4,18 +4,10 @@ import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 import * as API from '../API';
 import CONST from '../../CONST';
-import Growl from '../Growl';
-import * as Localize from '../Localize';
 import Navigation from '../Navigation/Navigation';
 import * as CardUtils from '../CardUtils';
-import * as User from './User';
 import ROUTES from '../../ROUTES';
 
-function deletePayPalMe() {
-    User.deletePaypalMeAddress();
-    Growl.show(Localize.translateLocal('walletPage.deletePayPalSuccess'), CONST.GROWL.SUCCESS, 3000);
-}
-
 /**
  * Sets up a ref to an instance of the KYC Wall component.
  */
@@ -26,12 +18,12 @@ const kycWallRef = createRef();
  */
 function continueSetup() {
     if (!kycWallRef.current || !kycWallRef.current.continue) {
-        Navigation.goBack();
+        Navigation.goBack(ROUTES.HOME);
         return;
     }
 
     // Close the screen (Add Debit Card, Add Bank Account, or Enable Payments) on success and continue with setup
-    Navigation.goBack();
+    Navigation.goBack(ROUTES.HOME);
     kycWallRef.current.continue();
 }
 
@@ -344,7 +336,6 @@ function deletePaymentCard(fundID) {
 }
 
 export {
-    deletePayPalMe,
     deletePaymentCard,
     addPaymentCard,
     openWalletPage,
diff --git a/src/libs/actions/PersistedRequests.js b/src/libs/actions/PersistedRequests.ts
similarity index 62%
rename from src/libs/actions/PersistedRequests.js
rename to src/libs/actions/PersistedRequests.ts
index be30e6b3c8ed..040c7d3d87a8 100644
--- a/src/libs/actions/PersistedRequests.js
+++ b/src/libs/actions/PersistedRequests.ts
@@ -1,22 +1,23 @@
 import Onyx from 'react-native-onyx';
-import _ from 'underscore';
+import isEqual from 'lodash/isEqual';
 import ONYXKEYS from '../../ONYXKEYS';
+import {Request} from '../../types/onyx';
 
-let persistedRequests = [];
+let persistedRequests: Request[] = [];
 
 Onyx.connect({
     key: ONYXKEYS.PERSISTED_REQUESTS,
-    callback: (val) => (persistedRequests = val || []),
+    callback: (val) => (persistedRequests = val ?? []),
 });
 
+/**
+ * This promise is only used by tests. DO NOT USE THIS PROMISE IN THE APPLICATION CODE
+ */
 function clear() {
-    Onyx.set(ONYXKEYS.PERSISTED_REQUESTS, []);
+    return Onyx.set(ONYXKEYS.PERSISTED_REQUESTS, []);
 }
 
-/**
- * @param {Array} requestsToPersist
- */
-function save(requestsToPersist) {
+function save(requestsToPersist: Request[]) {
     if (persistedRequests.length) {
         persistedRequests = persistedRequests.concat(requestsToPersist);
     } else {
@@ -25,16 +26,13 @@ function save(requestsToPersist) {
     Onyx.set(ONYXKEYS.PERSISTED_REQUESTS, persistedRequests);
 }
 
-/**
- * @param {Object} requestToRemove
- */
-function remove(requestToRemove) {
+function remove(requestToRemove: Request) {
     /**
      * We only remove the first matching request because the order of requests matters.
      * If we were to remove all matching requests, we can end up with a final state that is different than what the user intended.
      */
     const requests = [...persistedRequests];
-    const index = _.findIndex(requests, (persistedRequest) => _.isEqual(persistedRequest, requestToRemove));
+    const index = requests.findIndex((persistedRequest) => isEqual(persistedRequest, requestToRemove));
     if (index !== -1) {
         requests.splice(index, 1);
     }
@@ -43,10 +41,7 @@ function remove(requestToRemove) {
     Onyx.set(ONYXKEYS.PERSISTED_REQUESTS, requests);
 }
 
-/**
- * @returns {Array}
- */
-function getAll() {
+function getAll(): Request[] {
     return persistedRequests;
 }
 
diff --git a/src/libs/actions/PersonalDetails.js b/src/libs/actions/PersonalDetails.js
index dd80992e64a4..69cf05b89b34 100644
--- a/src/libs/actions/PersonalDetails.js
+++ b/src/libs/actions/PersonalDetails.js
@@ -429,6 +429,7 @@ function updateAvatar(file) {
                         avatar: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                         originalFileName: null,
                     },
+                    fallbackIcon: file.uri,
                 },
             },
         },
@@ -479,6 +480,7 @@ function deleteAvatar() {
             value: {
                 [currentUserAccountID]: {
                     avatar: defaultAvatar,
+                    fallbackIcon: null,
                 },
             },
         },
@@ -490,6 +492,7 @@ function deleteAvatar() {
             value: {
                 [currentUserAccountID]: {
                     avatar: allPersonalDetails[currentUserAccountID].avatar,
+                    fallbackIcon: allPersonalDetails[currentUserAccountID].fallbackIcon,
                 },
             },
         },
diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 87c77e722a5c..fcce909c5582 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -310,7 +310,7 @@ function createPolicyExpenseChats(policyID, invitedEmailsToAccountIDs) {
 
         workspaceMembersChats.onyxFailureData.push({
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${optimisticReport.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${optimisticReport.reportID}`,
             value: {
                 isLoadingReportActions: false,
             },
@@ -421,6 +421,7 @@ function updateWorkspaceAvatar(policyID, file) {
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 avatar: file.uri,
+                originalFileName: file.name,
                 errorFields: {
                     avatar: null,
                 },
@@ -713,13 +714,15 @@ function updateWorkspaceCustomUnitAndRate(policyID, currentCustomUnit, newCustom
         },
     ];
 
+    const newCustomUnitParam = _.clone(newCustomUnit);
+    newCustomUnitParam.rates = _.omit(newCustomUnitParam.rates, ['pendingAction', 'errors']);
     API.write(
         'UpdateWorkspaceCustomUnitAndRate',
         {
             policyID,
             lastModified,
-            customUnit: JSON.stringify(newCustomUnit),
-            customUnitRate: JSON.stringify(newCustomUnit.rates),
+            customUnit: JSON.stringify(newCustomUnitParam),
+            customUnitRate: JSON.stringify(newCustomUnitParam.rates),
         },
         {optimisticData, successData, failureData},
     );
diff --git a/src/libs/actions/QueuedOnyxUpdates.js b/src/libs/actions/QueuedOnyxUpdates.js
deleted file mode 100644
index 06f15be1340f..000000000000
--- a/src/libs/actions/QueuedOnyxUpdates.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import Onyx from 'react-native-onyx';
-import ONYXKEYS from '../../ONYXKEYS';
-
-// In this file we manage a queue of Onyx updates while the SequentialQueue is processing. There are functions to get the updates and clear the queue after saving the updates in Onyx.
-
-let queuedOnyxUpdates = [];
-Onyx.connect({
-    key: ONYXKEYS.QUEUED_ONYX_UPDATES,
-    callback: (val) => (queuedOnyxUpdates = val || []),
-});
-
-/**
- * @param {Array<Object>} updates Onyx updates to queue for later
- * @returns {Promise}
- */
-function queueOnyxUpdates(updates) {
-    return Onyx.set(ONYXKEYS.QUEUED_ONYX_UPDATES, [...queuedOnyxUpdates, ...updates]);
-}
-
-function clear() {
-    Onyx.set(ONYXKEYS.QUEUED_ONYX_UPDATES, null);
-}
-
-/**
- * @returns {Promise}
- */
-function flushQueue() {
-    return Onyx.update(queuedOnyxUpdates).then(clear);
-}
-
-export {queueOnyxUpdates, flushQueue};
diff --git a/src/libs/actions/QueuedOnyxUpdates.ts b/src/libs/actions/QueuedOnyxUpdates.ts
new file mode 100644
index 000000000000..1707bebd6cb2
--- /dev/null
+++ b/src/libs/actions/QueuedOnyxUpdates.ts
@@ -0,0 +1,21 @@
+import Onyx, {OnyxUpdate} from 'react-native-onyx';
+
+// In this file we manage a queue of Onyx updates while the SequentialQueue is processing. There are functions to get the updates and clear the queue after saving the updates in Onyx.
+
+let queuedOnyxUpdates: OnyxUpdate[] = [];
+
+/**
+ * @param updates Onyx updates to queue for later
+ */
+function queueOnyxUpdates(updates: OnyxUpdate[]): Promise<void> {
+    queuedOnyxUpdates = queuedOnyxUpdates.concat(updates);
+    return Promise.resolve();
+}
+
+function flushQueue(): Promise<void> {
+    return Onyx.update(queuedOnyxUpdates).then(() => {
+        queuedOnyxUpdates = [];
+    });
+}
+
+export {queueOnyxUpdates, flushQueue};
diff --git a/src/libs/actions/Receipt.ts b/src/libs/actions/Receipt.ts
deleted file mode 100644
index 530db149d902..000000000000
--- a/src/libs/actions/Receipt.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import Onyx from 'react-native-onyx';
-import ONYXKEYS from '../../ONYXKEYS';
-
-/**
- * Sets the upload receipt error modal content when an invalid receipt is uploaded
- */
-function setUploadReceiptError(isAttachmentInvalid: boolean, attachmentInvalidReasonTitle: string, attachmentInvalidReason: string) {
-    Onyx.merge(ONYXKEYS.RECEIPT_MODAL, {
-        isAttachmentInvalid,
-        attachmentInvalidReasonTitle,
-        attachmentInvalidReason,
-    });
-}
-
-/**
- * Clears the receipt error modal
- */
-function clearUploadReceiptError() {
-    Onyx.merge(ONYXKEYS.RECEIPT_MODAL, {
-        isAttachmentInvalid: false,
-        attachmentInvalidReasonTitle: '',
-        attachmentInvalidReason: '',
-    });
-}
-
-export default {
-    setUploadReceiptError,
-    clearUploadReceiptError,
-};
diff --git a/src/libs/actions/ReimbursementAccount/navigation.js b/src/libs/actions/ReimbursementAccount/navigation.js
index ae655c1ab8cf..1b75e6f16a58 100644
--- a/src/libs/actions/ReimbursementAccount/navigation.js
+++ b/src/libs/actions/ReimbursementAccount/navigation.js
@@ -20,7 +20,7 @@ function goToWithdrawalAccountSetupStep(stepID, newAchData) {
  * @param {string} [backTo=''] - An optional return path. If provided, it will be URL-encoded and appended to the resulting URL.
  */
 function navigateToBankAccountRoute(policyId, backTo) {
-    Navigation.navigate(ROUTES.getBankAccountRoute('', policyId, backTo));
+    Navigation.navigate(ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute('', policyId, backTo));
 }
 
 export {goToWithdrawalAccountSetupStep, navigateToBankAccountRoute};
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 85552fa14a56..66008ae5ae2a 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -25,9 +25,8 @@ import * as ErrorUtils from '../ErrorUtils';
 import * as UserUtils from '../UserUtils';
 import * as Welcome from './Welcome';
 import * as PersonalDetailsUtils from '../PersonalDetailsUtils';
-import SidebarUtils from '../SidebarUtils';
-import * as OptionsListUtils from '../OptionsListUtils';
 import * as Environment from '../Environment/Environment';
+import * as Session from './Session';
 
 let currentUserAccountID;
 Onyx.connect({
@@ -103,24 +102,24 @@ function getReportChannelName(reportID) {
 }
 
 /**
- * There are 2 possibilities that we can receive via pusher for a user's typing status:
+ * There are 2 possibilities that we can receive via pusher for a user's typing/leaving status:
  * 1. The "new" way from New Expensify is passed as {[login]: Boolean} (e.g. {yuwen@expensify.com: true}), where the value
- * is whether the user with that login is typing on the report or not.
+ * is whether the user with that login is typing/leaving on the report or not.
  * 2. The "old" way from e.com which is passed as {userLogin: login} (e.g. {userLogin: bstites@expensify.com})
  *
  * This method makes sure that no matter which we get, we return the "new" format
  *
- * @param {Object} typingStatus
+ * @param {Object} status
  * @returns {Object}
  */
-function getNormalizedTypingStatus(typingStatus) {
-    let normalizedTypingStatus = typingStatus;
+function getNormalizedStatus(status) {
+    let normalizedStatus = status;
 
-    if (_.first(_.keys(typingStatus)) === 'userLogin') {
-        normalizedTypingStatus = {[typingStatus.userLogin]: true};
+    if (_.first(_.keys(status)) === 'userLogin') {
+        normalizedStatus = {[status.userLogin]: true};
     }
 
-    return normalizedTypingStatus;
+    return normalizedStatus;
 }
 
 /**
@@ -141,7 +140,7 @@ function subscribeToReportTypingEvents(reportID) {
         // If the pusher message comes from OldDot, we expect the typing status to be keyed by user
         // login OR by 'Concierge'. If the pusher message comes from NewDot, it is keyed by accountID
         // since personal details are keyed by accountID.
-        const normalizedTypingStatus = getNormalizedTypingStatus(typingStatus);
+        const normalizedTypingStatus = getNormalizedStatus(typingStatus);
         const accountIDOrLogin = _.first(_.keys(normalizedTypingStatus));
 
         if (!accountIDOrLogin) {
@@ -170,6 +169,41 @@ function subscribeToReportTypingEvents(reportID) {
     });
 }
 
+/**
+ * Initialize our pusher subscriptions to listen for someone leaving a room.
+ *
+ * @param {String} reportID
+ */
+function subscribeToReportLeavingEvents(reportID) {
+    if (!reportID) {
+        return;
+    }
+
+    // Make sure we have a clean Leaving indicator before subscribing to leaving events
+    Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_USER_IS_LEAVING_ROOM}${reportID}`, false);
+
+    const pusherChannelName = getReportChannelName(reportID);
+    Pusher.subscribe(pusherChannelName, Pusher.TYPE.USER_IS_LEAVING_ROOM, (leavingStatus) => {
+        // If the pusher message comes from OldDot, we expect the leaving status to be keyed by user
+        // login OR by 'Concierge'. If the pusher message comes from NewDot, it is keyed by accountID
+        // since personal details are keyed by accountID.
+        const normalizedLeavingStatus = getNormalizedStatus(leavingStatus);
+        const accountIDOrLogin = _.first(_.keys(normalizedLeavingStatus));
+
+        if (!accountIDOrLogin) {
+            return;
+        }
+
+        if (Number(accountIDOrLogin) !== currentUserAccountID) {
+            return;
+        }
+
+        Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_USER_IS_LEAVING_ROOM}${reportID}`, true);
+    }).catch((error) => {
+        Log.hmmm('[Report] Failed to initially subscribe to Pusher channel', false, {errorType: error.type, pusherChannelName});
+    });
+}
+
 /**
  * Remove our pusher subscriptions to listen for someone typing in a report.
  *
@@ -185,6 +219,21 @@ function unsubscribeFromReportChannel(reportID) {
     Pusher.unsubscribe(pusherChannelName, Pusher.TYPE.USER_IS_TYPING);
 }
 
+/**
+ * Remove our pusher subscriptions to listen for someone leaving a report.
+ *
+ * @param {String} reportID
+ */
+function unsubscribeFromLeavingRoomReportChannel(reportID) {
+    if (!reportID) {
+        return;
+    }
+
+    const pusherChannelName = getReportChannelName(reportID);
+    Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_USER_IS_LEAVING_ROOM}${reportID}`, false);
+    Pusher.unsubscribe(pusherChannelName, Pusher.TYPE.USER_IS_LEAVING_ROOM);
+}
+
 // New action subscriber array for report pages
 let newActionSubscribers = [];
 
@@ -401,43 +450,63 @@ function reportActionsExist(reportID) {
  * @param {Array} participantAccountIDList The list of accountIDs that are included in a new chat, not including the user creating it
  */
 function openReport(reportID, participantLoginList = [], newReportObject = {}, parentReportActionID = '0', isFromDeepLink = false, participantAccountIDList = []) {
-    const optimisticReportData = {
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-        value: reportActionsExist(reportID)
-            ? {}
-            : {
-                  isLoadingReportActions: true,
-                  isLoadingMoreReportActions: false,
-                  reportName: lodashGet(allReports, [reportID, 'reportName'], CONST.REPORT.DEFAULT_REPORT_NAME),
-              },
-    };
-    const reportSuccessData = {
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-        value: {
-            isLoadingReportActions: false,
-            pendingFields: {
-                createChat: null,
+    const optimisticReportData = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+            value: reportActionsExist(reportID)
+                ? {}
+                : {
+                      reportName: lodashGet(allReports, [reportID, 'reportName'], CONST.REPORT.DEFAULT_REPORT_NAME),
+                  },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
+            value: {
+                isLoadingReportActions: true,
+                isLoadingMoreReportActions: false,
             },
-            errorFields: {
-                createChat: null,
+        },
+    ];
+
+    const reportSuccessData = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+            value: {
+                pendingFields: {
+                    createChat: null,
+                },
+                errorFields: {
+                    createChat: null,
+                },
+                isOptimisticReport: false,
             },
-            isOptimisticReport: false,
         },
-    };
-    const reportFailureData = {
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-        value: {
-            isLoadingReportActions: false,
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
+            value: {
+                isLoadingReportActions: false,
+            },
         },
-    };
+    ];
+
+    const reportFailureData = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
+            value: {
+                isLoadingReportActions: false,
+            },
+        },
+    ];
 
     const onyxData = {
-        optimisticData: [optimisticReportData],
-        successData: [reportSuccessData],
-        failureData: [reportFailureData],
+        optimisticData: optimisticReportData,
+        successData: reportSuccessData,
+        failureData: reportFailureData,
     };
 
     const params = {
@@ -454,17 +523,17 @@ function openReport(reportID, participantLoginList = [], newReportObject = {}, p
     // If we open an exist report, but it is not present in Onyx yet, we should change the method to set for this report
     // and we need data to be available when we navigate to the chat page
     if (_.isEmpty(ReportUtils.getReport(reportID))) {
-        optimisticReportData.onyxMethod = Onyx.METHOD.SET;
+        onyxData.optimisticData[0].onyxMethod = Onyx.METHOD.SET;
     }
 
     // If we are creating a new report, we need to add the optimistic report data and a report action
     if (!_.isEmpty(newReportObject)) {
         // Change the method to set for new reports because it doesn't exist yet, is faster,
         // and we need the data to be available when we navigate to the chat page
-        optimisticReportData.onyxMethod = Onyx.METHOD.SET;
-        optimisticReportData.value = {
+        onyxData.optimisticData[0].onyxMethod = Onyx.METHOD.SET;
+        onyxData.optimisticData[0].value = {
             reportName: CONST.REPORT.DEFAULT_REPORT_NAME,
-            ...optimisticReportData.value,
+            ...onyxData.optimisticData[0].value,
             ...newReportObject,
             pendingFields: {
                 createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
@@ -559,10 +628,11 @@ function openReport(reportID, participantLoginList = [], newReportObject = {}, p
  */
 function navigateToAndOpenReport(userLogins, shouldDismissModal = true) {
     let newChat = {};
-    const formattedUserLogins = _.map(userLogins, (login) => OptionsListUtils.addSMSDomainIfPhoneNumber(login).toLowerCase());
-    const chat = ReportUtils.getChatByParticipantsByLoginList(formattedUserLogins);
+
+    const participantAccountIDs = PersonalDetailsUtils.getAccountIDsByLogins(userLogins);
+    const chat = ReportUtils.getChatByParticipants(participantAccountIDs);
+
     if (!chat) {
-        const participantAccountIDs = PersonalDetailsUtils.getAccountIDsByLogins(userLogins);
         newChat = ReportUtils.buildOptimisticChatReport(participantAccountIDs);
     }
     const reportID = chat ? chat.reportID : newChat.reportID;
@@ -572,7 +642,7 @@ function navigateToAndOpenReport(userLogins, shouldDismissModal = true) {
     if (shouldDismissModal) {
         Navigation.dismissModal(reportID);
     } else {
-        Navigation.navigate(ROUTES.getReportRoute(reportID));
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
     }
 }
 
@@ -605,7 +675,7 @@ function navigateToAndOpenReportWithAccountIDs(participantAccountIDs) {
 function navigateToAndOpenChildReport(childReportID = '0', parentReportAction = {}, parentReportID = '0') {
     if (childReportID !== '0') {
         openReport(childReportID);
-        Navigation.navigate(ROUTES.getReportRoute(childReportID));
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(childReportID));
     } else {
         const participantAccountIDs = _.uniq([currentUserAccountID, Number(parentReportAction.actorAccountID)]);
         const parentReport = allReports[parentReportID];
@@ -619,14 +689,14 @@ function navigateToAndOpenChildReport(childReportID = '0', parentReportAction =
             '',
             undefined,
             undefined,
-            CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS,
+            CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
             parentReportAction.reportActionID,
             parentReportID,
         );
 
         const participantLogins = PersonalDetailsUtils.getLoginsByAccountIDs(newChat.participantAccountIDs);
         openReport(newChat.reportID, participantLogins, newChat, parentReportAction.reportActionID);
-        Navigation.navigate(ROUTES.getReportRoute(newChat.reportID));
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(newChat.reportID));
     }
 }
 
@@ -646,17 +716,23 @@ function reconnect(reportID) {
                 {
                     onyxMethod: Onyx.METHOD.MERGE,
                     key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+                    value: {
+                        reportName: lodashGet(allReports, [reportID, 'reportName'], CONST.REPORT.DEFAULT_REPORT_NAME),
+                    },
+                },
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
                     value: {
                         isLoadingReportActions: true,
                         isLoadingMoreReportActions: false,
-                        reportName: lodashGet(allReports, [reportID, 'reportName'], CONST.REPORT.DEFAULT_REPORT_NAME),
                     },
                 },
             ],
             successData: [
                 {
                     onyxMethod: Onyx.METHOD.MERGE,
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+                    key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
                     value: {
                         isLoadingReportActions: false,
                     },
@@ -665,7 +741,7 @@ function reconnect(reportID) {
             failureData: [
                 {
                     onyxMethod: Onyx.METHOD.MERGE,
-                    key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+                    key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
                     value: {
                         isLoadingReportActions: false,
                     },
@@ -865,6 +941,17 @@ function broadcastUserIsTyping(reportID) {
     typingStatus[currentUserAccountID] = true;
     Pusher.sendEvent(privateReportChannelName, Pusher.TYPE.USER_IS_TYPING, typingStatus);
 }
+/**
+ * Broadcasts to the report's private pusher channel whether a user is leaving a report
+ *
+ * @param {String} reportID
+ */
+function broadcastUserIsLeavingRoom(reportID) {
+    const privateReportChannelName = getReportChannelName(reportID);
+    const leavingStatus = {};
+    leavingStatus[currentUserAccountID] = true;
+    Pusher.sendEvent(privateReportChannelName, Pusher.TYPE.USER_IS_LEAVING_ROOM, leavingStatus);
+}
 
 /**
  * When a report changes in Onyx, this fetches the report from the API if the report doesn't have a name
@@ -885,7 +972,7 @@ function handleReportChanged(report) {
         // Only re-route them if they are still looking at the optimistically created report
         if (Navigation.getActiveRoute().includes(`/r/${report.reportID}`)) {
             // Pass 'FORCED_UP' type to replace new report on second login with proper one in the Navigation
-            Navigation.navigate(ROUTES.getReportRoute(report.preexistingReportID), CONST.NAVIGATION.TYPE.FORCED_UP);
+            Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report.preexistingReportID), CONST.NAVIGATION.TYPE.FORCED_UP);
         }
         return;
     }
@@ -1066,7 +1153,7 @@ const removeLinksFromHtml = (html, links) => {
  */
 const handleUserDeletedLinksInHtml = (newCommentText, originalHtml) => {
     const parser = new ExpensiMark();
-    if (newCommentText.length >= CONST.MAX_MARKUP_LENGTH) {
+    if (newCommentText.length > CONST.MAX_MARKUP_LENGTH) {
         return newCommentText;
     }
     const markdownOriginalComment = parser.htmlToMarkdown(originalHtml).trim();
@@ -1093,10 +1180,10 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
     const htmlForNewComment = handleUserDeletedLinksInHtml(textForNewComment, originalCommentHTML);
     const reportComment = parser.htmlToText(htmlForNewComment);
 
-    // For comments shorter than 10k chars, convert the comment from MD into HTML because that's how it is stored in the database
+    // For comments shorter than or equal to 10k chars, convert the comment from MD into HTML because that's how it is stored in the database
     // For longer comments, skip parsing and display plaintext for performance reasons. It takes over 40s to parse a 100k long string!!
     let parsedOriginalCommentHTML = originalCommentHTML;
-    if (textForNewComment.length < CONST.MAX_MARKUP_LENGTH) {
+    if (textForNewComment.length <= CONST.MAX_MARKUP_LENGTH) {
         const autolinkFilter = {filterRules: _.filter(_.pluck(parser.rules, 'name'), (name) => name !== 'autolink')};
         parsedOriginalCommentHTML = parser.replace(parser.htmlToMarkdown(originalCommentHTML).trim(), autolinkFilter);
     }
@@ -1188,11 +1275,12 @@ function editReportComment(reportID, originalReportAction, textForNewComment) {
  * Saves the draft for a comment report action. This will put the comment into "edit mode"
  *
  * @param {String} reportID
- * @param {Number} reportActionID
+ * @param {Object} reportAction
  * @param {String} draftMessage
  */
-function saveReportActionDraft(reportID, reportActionID, draftMessage) {
-    Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${reportID}_${reportActionID}`, draftMessage);
+function saveReportActionDraft(reportID, reportAction, draftMessage) {
+    const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
+    Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${originalReportID}_${reportAction.reportActionID}`, draftMessage);
 }
 
 /**
@@ -1209,10 +1297,13 @@ function saveReportActionDraftNumberOfLines(reportID, reportActionID, numberOfLi
  * @param {String} reportID
  * @param {String} previousValue
  * @param {String} newValue
+ * @param {boolean} navigate
  */
-function updateNotificationPreferenceAndNavigate(reportID, previousValue, newValue) {
+function updateNotificationPreference(reportID, previousValue, newValue, navigate) {
     if (previousValue === newValue) {
-        Navigation.goBack(ROUTES.getReportSettingsRoute(reportID));
+        if (navigate) {
+            Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(reportID));
+        }
         return;
     }
     const optimisticData = [
@@ -1230,7 +1321,9 @@ function updateNotificationPreferenceAndNavigate(reportID, previousValue, newVal
         },
     ];
     API.write('UpdateReportNotificationPreference', {reportID, notificationPreference: newValue}, {optimisticData, failureData});
-    Navigation.goBack(ROUTES.getReportSettingsRoute(reportID));
+    if (navigate) {
+        Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(reportID));
+    }
 }
 
 /**
@@ -1241,7 +1334,7 @@ function updateNotificationPreferenceAndNavigate(reportID, previousValue, newVal
 function updateWelcomeMessage(reportID, previousValue, newValue) {
     // No change needed, navigate back
     if (previousValue === newValue) {
-        Navigation.goBack();
+        Navigation.goBack(ROUTES.HOME);
         return;
     }
 
@@ -1261,7 +1354,7 @@ function updateWelcomeMessage(reportID, previousValue, newValue) {
         },
     ];
     API.write('UpdateWelcomeMessage', {reportID, welcomeMessage: parsedWelcomeMessage}, {optimisticData, failureData});
-    Navigation.goBack();
+    Navigation.goBack(ROUTES.HOME);
 }
 
 /**
@@ -1270,7 +1363,7 @@ function updateWelcomeMessage(reportID, previousValue, newValue) {
  */
 function updateWriteCapabilityAndNavigate(report, newValue) {
     if (report.writeCapability === newValue) {
-        Navigation.goBack(ROUTES.getReportSettingsRoute(report.reportID));
+        Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(report.reportID));
         return;
     }
 
@@ -1290,7 +1383,7 @@ function updateWriteCapabilityAndNavigate(report, newValue) {
     ];
     API.write('UpdateReportWriteCapability', {reportID: report.reportID, writeCapability: newValue}, {optimisticData, failureData});
     // Return to the report settings page since this field utilizes push-to-page
-    Navigation.goBack(ROUTES.getReportSettingsRoute(report.reportID));
+    Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(report.reportID));
 }
 
 /**
@@ -1305,7 +1398,7 @@ function navigateToConciergeChat() {
             navigateToAndOpenReport([CONST.EMAIL.CONCIERGE], false);
         });
     } else {
-        Navigation.navigate(ROUTES.getReportRoute(conciergeChatReportID));
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(conciergeChatReportID));
     }
 }
 
@@ -1438,7 +1531,7 @@ function deleteReport(reportID) {
  */
 function navigateToConciergeChatAndDeleteReport(reportID) {
     // Dismiss the current report screen and replace it with Concierge Chat
-    Navigation.goBack();
+    Navigation.goBack(ROUTES.HOME);
     navigateToConciergeChat();
     deleteReport(reportID);
 }
@@ -1455,7 +1548,7 @@ function updatePolicyRoomNameAndNavigate(policyRoomReport, policyRoomName) {
 
     // No change needed, navigate back
     if (previousName === policyRoomName) {
-        Navigation.goBack(ROUTES.getReportSettingsRoute(reportID));
+        Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(reportID));
         return;
     }
     const optimisticData = [
@@ -1494,7 +1587,7 @@ function updatePolicyRoomNameAndNavigate(policyRoomReport, policyRoomName) {
         },
     ];
     API.write('UpdatePolicyRoomName', {reportID, policyRoomName}, {optimisticData, successData, failureData});
-    Navigation.goBack(ROUTES.getReportSettingsRoute(reportID));
+    Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(reportID));
 }
 
 /**
@@ -1566,9 +1659,9 @@ function shouldShowReportActionNotification(reportID, action = null, isRemote =
         return false;
     }
 
-    // Don't show a notification if no comment exists
-    if (action && !_.some(action.message, (f) => f.type === 'COMMENT')) {
-        Log.info(`${tag} No notification because no comments exist for the current action`);
+    // Only show notifications for supported types of report actions
+    if (!ReportActionsUtils.isNotifiableReportAction(action)) {
+        Log.info(`${tag} No notification because this action type is not supported`, false, {actionName: action.actionName});
         return false;
     }
 
@@ -1577,23 +1670,28 @@ function shouldShowReportActionNotification(reportID, action = null, isRemote =
 
 /**
  * @param {String} reportID
- * @param {Object} action
+ * @param {Object} reportAction
  */
-function showReportActionNotification(reportID, action) {
-    if (!shouldShowReportActionNotification(reportID, action)) {
+function showReportActionNotification(reportID, reportAction) {
+    if (!shouldShowReportActionNotification(reportID, reportAction)) {
         return;
     }
 
     Log.info('[LocalNotification] Creating notification');
-    LocalNotification.showCommentNotification({
-        report: allReports[reportID],
-        reportAction: action,
-        onClick: () => {
-            // Navigate to this report onClick
-            Navigation.navigate(ROUTES.getReportRoute(reportID));
-        },
-    });
-    notifyNewAction(reportID, action.actorAccountID, action.reportActionID);
+    const report = allReports[reportID];
+
+    const notificationParams = {
+        report,
+        reportAction,
+        onClick: () => Navigation.navigate(ROUTES.getReportRoute(reportID)),
+    };
+    if (reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.MODIFIEDEXPENSE) {
+        LocalNotification.showModifiedExpenseNotification(notificationParams);
+    } else {
+        LocalNotification.showCommentNotification(notificationParams);
+    }
+
+    notifyNewAction(reportID, reportAction.actorAccountID, reportAction.reportActionID);
 }
 
 /**
@@ -1759,13 +1857,12 @@ function openReportFromDeepLink(url, isAuthenticated) {
 
     // Navigate to the report after sign-in/sign-up.
     InteractionManager.runAfterInteractions(() => {
-        SidebarUtils.isSidebarLoadedReady().then(() => {
-            if (reportID) {
-                Navigation.navigate(ROUTES.getReportRoute(reportID), CONST.NAVIGATION.TYPE.UP);
-            }
+        Session.waitForUserSignIn().then(() => {
             if (route === ROUTES.CONCIERGE) {
                 navigateToConciergeChat();
+                return;
             }
+            Navigation.navigate(route, CONST.NAVIGATION.TYPE.PUSH);
         });
     });
 }
@@ -1782,6 +1879,12 @@ function getCurrentUserAccountID() {
 function leaveRoom(reportID) {
     const report = lodashGet(allReports, [reportID], {});
     const reportKeys = _.keys(report);
+
+    // Pusher's leavingStatus should be sent earlier.
+    // Place the broadcast before calling the LeaveRoom API to prevent a race condition
+    // between Onyx report being null and Pusher's leavingStatus becoming true.
+    broadcastUserIsLeavingRoom(reportID);
+
     API.write(
         'LeaveRoom',
         {
@@ -1821,7 +1924,11 @@ function leaveRoom(reportID) {
     );
     Navigation.dismissModal();
     if (Navigation.getTopmostReportId() === reportID) {
-        Navigation.goBack();
+        Navigation.goBack(ROUTES.HOME);
+    }
+    if (report.parentReportID) {
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report.parentReportID), CONST.NAVIGATION.TYPE.FORCED_UP);
+        return;
     }
     navigateToConciergeChat();
 }
@@ -1841,7 +1948,7 @@ function setLastOpenedPublicRoom(reportID) {
 function openLastOpenedPublicRoom(lastOpenedPublicRoomID) {
     Navigation.isNavigationReady().then(() => {
         setLastOpenedPublicRoom('');
-        Navigation.navigate(ROUTES.getReportRoute(lastOpenedPublicRoomID));
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(lastOpenedPublicRoomID));
     });
 }
 
@@ -1930,18 +2037,151 @@ function flagComment(reportID, reportAction, severity) {
     API.write('FlagComment', parameters, {optimisticData, successData, failureData});
 }
 
+/**
+ * Updates a given user's private notes on a report
+ *
+ * @param {String} reportID
+ * @param {Number} accountID
+ * @param {String} note
+ */
+const updatePrivateNotes = (reportID, accountID, note) => {
+    const optimisticData = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+            value: {
+                privateNotes: {
+                    [accountID]: {
+                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                        errors: null,
+                        note,
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+            value: {
+                privateNotes: {
+                    [accountID]: {
+                        pendingAction: null,
+                        errors: null,
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+            value: {
+                privateNotes: {
+                    [accountID]: {
+                        errors: ErrorUtils.getMicroSecondOnyxError("Private notes couldn't be saved"),
+                    },
+                },
+            },
+        },
+    ];
+
+    API.write(
+        'UpdateReportPrivateNote',
+        {
+            reportID,
+            privateNotes: note,
+        },
+        {optimisticData, successData, failureData},
+    );
+};
+
+/**
+ * Fetches all the private notes for a given report
+ *
+ * @param {String} reportID
+ */
+function getReportPrivateNote(reportID) {
+    if (_.isEmpty(reportID)) {
+        return;
+    }
+    API.read(
+        'GetReportPrivateNote',
+        {
+            reportID,
+        },
+        {
+            optimisticData: [
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+                    value: {
+                        isLoadingPrivateNotes: true,
+                    },
+                },
+            ],
+            successData: [
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+                    value: {
+                        isLoadingPrivateNotes: false,
+                    },
+                },
+            ],
+            failureData: [
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+                    value: {
+                        isLoadingPrivateNotes: false,
+                    },
+                },
+            ],
+        },
+    );
+}
+
+/**
+ * Checks if there are any errors in the private notes for a given report
+ *
+ * @param {Object} report
+ * @returns {Boolean} Returns true if there are errors in any of the private notes on the report
+ */
+function hasErrorInPrivateNotes(report) {
+    const privateNotes = lodashGet(report, 'privateNotes', {});
+    return _.some(privateNotes, (privateNote) => !_.isEmpty(privateNote.errors));
+}
+
+/**
+ * Clears all errors associated with a given private note
+ *
+ * @param {String} reportID
+ * @param {Number} accountID
+ */
+function clearPrivateNotesError(reportID, accountID) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {privateNotes: {[accountID]: {errors: null}}});
+}
+
 export {
     addComment,
     addAttachment,
     reconnect,
     updateWelcomeMessage,
     updateWriteCapabilityAndNavigate,
-    updateNotificationPreferenceAndNavigate,
+    updateNotificationPreference,
     subscribeToReportTypingEvents,
+    subscribeToReportLeavingEvents,
     unsubscribeFromReportChannel,
+    unsubscribeFromLeavingRoomReportChannel,
     saveReportComment,
     saveReportCommentNumberOfLines,
     broadcastUserIsTyping,
+    broadcastUserIsLeavingRoom,
     togglePinnedState,
     editReportComment,
     handleUserDeletedLinksInHtml,
@@ -1977,4 +2217,8 @@ export {
     setLastOpenedPublicRoom,
     flagComment,
     openLastOpenedPublicRoom,
+    updatePrivateNotes,
+    getReportPrivateNote,
+    clearPrivateNotesError,
+    hasErrorInPrivateNotes,
 };
diff --git a/src/libs/actions/ReportActions.js b/src/libs/actions/ReportActions.ts
similarity index 59%
rename from src/libs/actions/ReportActions.js
rename to src/libs/actions/ReportActions.ts
index 55d81cb6eb14..3faa1dbe3574 100644
--- a/src/libs/actions/ReportActions.js
+++ b/src/libs/actions/ReportActions.ts
@@ -2,20 +2,24 @@ import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 import CONST from '../../CONST';
 import * as ReportActionUtils from '../ReportActionsUtils';
+import * as ReportUtils from '../ReportUtils';
+import ReportAction from '../../types/onyx/ReportAction';
+
+function clearReportActionErrors(reportID: string, reportAction: ReportAction) {
+    const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
+
+    if (!reportAction.reportActionID) {
+        return;
+    }
 
-/**
- * @param {String} reportID
- * @param {Object} reportAction
- */
-function clearReportActionErrors(reportID, reportAction) {
     if (reportAction.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
         // Delete the optimistic action
-        Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {
+        Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${originalReportID}`, {
             [reportAction.reportActionID]: null,
         });
 
         // If there's a linked transaction, delete that too
-        const linkedTransactionID = ReportActionUtils.getLinkedTransactionID(reportID, reportAction.reportActionID);
+        const linkedTransactionID = ReportActionUtils.getLinkedTransactionID(originalReportID, reportAction.reportActionID);
         if (linkedTransactionID) {
             Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${linkedTransactionID}`, null);
         }
@@ -23,7 +27,7 @@ function clearReportActionErrors(reportID, reportAction) {
         return;
     }
 
-    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${originalReportID}`, {
         [reportAction.reportActionID]: {
             errors: null,
         },
diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index aa5ff229267f..117a092c3875 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -20,13 +20,23 @@ import * as Device from '../Device';
 import ROUTES from '../../../ROUTES';
 import * as ErrorUtils from '../../ErrorUtils';
 import * as ReportUtils from '../../ReportUtils';
-import * as Report from '../Report';
 import {hideContextMenu} from '../../../pages/home/report/ContextMenu/ReportActionContextMenu';
 
-let authTokenType = '';
+let sessionAuthTokenType = '';
+let sessionAuthToken = null;
+let authPromiseResolver = null;
+
 Onyx.connect({
     key: ONYXKEYS.SESSION,
-    callback: (session) => (authTokenType = lodashGet(session, 'authTokenType')),
+    callback: (session) => {
+        sessionAuthTokenType = lodashGet(session, 'authTokenType');
+        sessionAuthToken = lodashGet(session, 'authToken');
+
+        if (sessionAuthToken && authPromiseResolver) {
+            authPromiseResolver(true);
+            authPromiseResolver = null;
+        }
+    },
 });
 
 let credentials = {};
@@ -35,6 +45,12 @@ Onyx.connect({
     callback: (val) => (credentials = val || {}),
 });
 
+let preferredLocale;
+Onyx.connect({
+    key: ONYXKEYS.NVP_PREFERRED_LOCALE,
+    callback: (val) => (preferredLocale = val),
+});
+
 /**
  * Clears the Onyx store and redirects user to the sign in page
  */
@@ -61,7 +77,7 @@ function signOut() {
  * @return {boolean}
  */
 function isAnonymousUser() {
-    return authTokenType === 'anonymousAccount';
+    return sessionAuthTokenType === 'anonymousAccount';
 }
 
 function signOutAndRedirectToSignIn() {
@@ -75,7 +91,7 @@ function signOutAndRedirectToSignIn() {
         Linking.getInitialURL().then((url) => {
             const reportID = ReportUtils.getReportIDFromLink(url);
             if (reportID) {
-                Report.setLastOpenedPublicRoom(reportID);
+                Onyx.merge(ONYXKEYS.LAST_OPENED_PUBLIC_ROOM_ID, reportID);
             }
         });
     }
@@ -244,7 +260,7 @@ function beginSignIn(login) {
  */
 function beginAppleSignIn(idToken) {
     const {optimisticData, successData, failureData} = signInAttemptState();
-    API.write('SignInWithApple', {idToken}, {optimisticData, successData, failureData});
+    API.write('SignInWithApple', {idToken, preferredLocale}, {optimisticData, successData, failureData});
 }
 
 /**
@@ -255,7 +271,7 @@ function beginAppleSignIn(idToken) {
  */
 function beginGoogleSignIn(token) {
     const {optimisticData, successData, failureData} = signInAttemptState();
-    API.write('SignInWithGoogle', {token}, {optimisticData, successData, failureData});
+    API.write('SignInWithGoogle', {token, preferredLocale}, {optimisticData, successData, failureData});
 }
 
 /**
@@ -311,9 +327,8 @@ function signInWithShortLivedAuthToken(email, authToken) {
  *
  * @param {String} validateCode 6 digit code required for login
  * @param {String} [twoFactorAuthCode]
- * @param {String} [preferredLocale] Indicates which language to use when the user lands in the app
  */
-function signIn(validateCode, twoFactorAuthCode, preferredLocale = CONST.LOCALES.DEFAULT) {
+function signIn(validateCode, twoFactorAuthCode) {
     const optimisticData = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -370,7 +385,7 @@ function signIn(validateCode, twoFactorAuthCode, preferredLocale = CONST.LOCALES
     });
 }
 
-function signInWithValidateCode(accountID, code, preferredLocale = CONST.LOCALES.DEFAULT, twoFactorAuthCode = '') {
+function signInWithValidateCode(accountID, code, twoFactorAuthCode = '') {
     // If this is called from the 2fa step, get the validateCode directly from onyx
     // instead of the one passed from the component state because the state is changing when this method is called.
     const validateCode = twoFactorAuthCode ? credentials.validateCode : code;
@@ -446,8 +461,8 @@ function signInWithValidateCode(accountID, code, preferredLocale = CONST.LOCALES
     });
 }
 
-function signInWithValidateCodeAndNavigate(accountID, validateCode, preferredLocale = CONST.LOCALES.DEFAULT, twoFactorAuthCode = '') {
-    signInWithValidateCode(accountID, validateCode, preferredLocale, twoFactorAuthCode);
+function signInWithValidateCodeAndNavigate(accountID, validateCode, twoFactorAuthCode = '') {
+    signInWithValidateCode(accountID, validateCode, twoFactorAuthCode);
     Navigation.navigate(ROUTES.HOME);
 }
 
@@ -749,6 +764,29 @@ function validateTwoFactorAuth(twoFactorAuthCode) {
     API.write('TwoFactorAuth_Validate', {twoFactorAuthCode}, {optimisticData, successData, failureData});
 }
 
+/**
+ * Waits for a user to sign in.
+ *
+ * If the user is already signed in (`authToken` is truthy), the promise resolves immediately.
+ * Otherwise, the promise will resolve when the `authToken` in `ONYXKEYS.SESSION` becomes truthy via the Onyx callback.
+ * The promise will not reject on failed login attempt.
+ *
+ * @returns {Promise<boolean>} A promise that resolves to `true` once the user is signed in.
+ * @example
+ * waitForUserSignIn().then(() => {
+ *   console.log('User is signed in!');
+ * });
+ */
+function waitForUserSignIn() {
+    return new Promise((resolve) => {
+        if (sessionAuthToken) {
+            resolve(true);
+        } else {
+            authPromiseResolver = resolve;
+        }
+    });
+}
+
 export {
     beginSignIn,
     beginAppleSignIn,
@@ -776,4 +814,5 @@ export {
     isAnonymousUser,
     toggleTwoFactorAuth,
     validateTwoFactorAuth,
+    waitForUserSignIn,
 };
diff --git a/src/libs/actions/Tab.js b/src/libs/actions/Tab.ts
similarity index 54%
rename from src/libs/actions/Tab.js
rename to src/libs/actions/Tab.ts
index 0af197361b70..7acd978d6b1a 100644
--- a/src/libs/actions/Tab.js
+++ b/src/libs/actions/Tab.ts
@@ -3,12 +3,9 @@ import ONYXKEYS from '../../ONYXKEYS';
 
 /**
  * Sets the selected tab for a given tab ID
- *
- * @param {String} id
- * @param {String} index
  */
-function setSelectedTab(id, index) {
-    Onyx.merge(`${ONYXKEYS.SELECTED_TAB}_${id}`, index);
+function setSelectedTab(id: string, index: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.SELECTED_TAB}${id}`, index);
 }
 
 export default {
diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js
index d66cc243acf4..971289e5b9e4 100644
--- a/src/libs/actions/Task.js
+++ b/src/libs/actions/Task.js
@@ -13,6 +13,7 @@ import * as ErrorUtils from '../ErrorUtils';
 import * as ReportActionsUtils from '../ReportActionsUtils';
 import * as Expensicons from '../../components/Icon/Expensicons';
 import * as LocalePhoneNumber from '../LocalePhoneNumber';
+import * as Localize from '../Localize';
 
 let currentUserEmail;
 let currentUserAccountID;
@@ -58,9 +59,10 @@ function clearOutTaskInfo() {
  * @param {String} assigneeEmail
  * @param {Number} assigneeAccountID
  * @param {Object} assigneeChatReport - The chat report between you and the assignee
+ * @param {String} policyID - the policyID of the parent report
  */
-function createTaskAndNavigate(parentReportID, title, description, assigneeEmail, assigneeAccountID = 0, assigneeChatReport = null) {
-    const optimisticTaskReport = ReportUtils.buildOptimisticTaskReport(currentUserAccountID, assigneeAccountID, parentReportID, title, description);
+function createTaskAndNavigate(parentReportID, title, description, assigneeEmail, assigneeAccountID = 0, assigneeChatReport = null, policyID = CONST.POLICY.OWNER_EMAIL_FAKE) {
+    const optimisticTaskReport = ReportUtils.buildOptimisticTaskReport(currentUserAccountID, assigneeAccountID, parentReportID, title, description, policyID);
 
     const assigneeChatReportID = assigneeChatReport ? assigneeChatReport.reportID : 0;
     const taskReportID = optimisticTaskReport.reportID;
@@ -68,7 +70,7 @@ function createTaskAndNavigate(parentReportID, title, description, assigneeEmail
 
     // Parent ReportAction indicating that a task has been created
     const optimisticTaskCreatedAction = ReportUtils.buildOptimisticCreatedReportAction(currentUserEmail);
-    const optimisticAddCommentReport = ReportUtils.buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeEmail, assigneeAccountID, `Created a task: ${title}`, parentReportID);
+    const optimisticAddCommentReport = ReportUtils.buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeEmail, assigneeAccountID, `task for ${title}`, parentReportID);
     optimisticTaskReport.parentReportActionID = optimisticAddCommentReport.reportAction.reportActionID;
 
     const currentTime = DateUtils.getDBTime();
@@ -187,6 +189,8 @@ function createTaskAndNavigate(parentReportID, title, description, assigneeEmail
         value: {[optimisticAddCommentReport.reportAction.reportActionID]: {pendingAction: null}},
     });
 
+    clearOutTaskInfo();
+
     API.write(
         'CreateTask',
         {
@@ -215,11 +219,10 @@ function createTaskAndNavigate(parentReportID, title, description, assigneeEmail
 /**
  * Complete a task
  * @param {Object} taskReport task report
- * @param {String} taskTitle Title of the task
  */
-function completeTask(taskReport, taskTitle) {
+function completeTask(taskReport) {
     const taskReportID = taskReport.reportID;
-    const message = `completed task: ${taskTitle}`;
+    const message = `marked as complete`;
     const completedTaskReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASKCOMPLETED, message);
 
     const optimisticData = [
@@ -270,12 +273,6 @@ function completeTask(taskReport, taskTitle) {
         },
     ];
 
-    // Update optimistic data for parent report action
-    const optimisticDataForParentReportAction = ReportUtils.getOptimisticDataForParentReportAction(taskReportID, completedTaskReportAction.created, CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-    if (!_.isEmpty(optimisticDataForParentReportAction)) {
-        optimisticData.push(optimisticDataForParentReportAction);
-    }
-
     // Multiple report actions can link to the same child. Both share destination (task parent) and assignee report link to the same report action.
     // We need to find and update the other parent report action (in assignee report). More info https://github.com/Expensify/App/issues/23920#issuecomment-1663092717
     const assigneeReportAction = ReportUtils.getTaskParentReportActionIDInAssigneeReport(taskReport);
@@ -305,11 +302,10 @@ function completeTask(taskReport, taskTitle) {
 /**
  * Reopen a closed task
  * @param {Object} taskReport task report
- * @param {String} taskTitle Title of the task
  */
-function reopenTask(taskReport, taskTitle) {
+function reopenTask(taskReport) {
     const taskReportID = taskReport.reportID;
-    const message = `reopened task: ${taskTitle}`;
+    const message = `marked as incomplete`;
     const reopenedTaskReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASKREOPENED, message);
 
     const optimisticData = [
@@ -363,12 +359,6 @@ function reopenTask(taskReport, taskTitle) {
         },
     ];
 
-    // Update optimistic data for parent report action
-    const optimisticDataForParentReportAction = ReportUtils.getOptimisticDataForParentReportAction(taskReportID, reopenedTaskReportAction.created, CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-    if (!_.isEmpty(optimisticDataForParentReportAction)) {
-        optimisticData.push(optimisticDataForParentReportAction);
-    }
-
     // Multiple report actions can link to the same child. Both share destination (task parent) and assignee report link to the same report action.
     // We need to find and update the other parent report action (in assignee report). More info https://github.com/Expensify/App/issues/23920#issuecomment-1663092717
     const assigneeReportAction = ReportUtils.getTaskParentReportActionIDInAssigneeReport(taskReport);
@@ -650,7 +640,7 @@ function setAssigneeValue(assigneeEmail, assigneeAccountID, shareDestination, is
     let chatReport;
 
     if (!isCurrentUser) {
-        chatReport = ReportUtils.getChatByParticipantsByLoginList([assigneeEmail]) || ReportUtils.getChatByParticipants([assigneeAccountID]);
+        chatReport = ReportUtils.getChatByParticipants([assigneeAccountID]);
         if (!chatReport) {
             chatReport = ReportUtils.buildOptimisticChatReport([assigneeAccountID]);
             chatReport.isOptimisticReport = true;
@@ -751,7 +741,7 @@ function getShareDestination(reportID, reports, personalDetails) {
         subtitle = ReportUtils.getChatRoomSubtitle(report);
     }
     return {
-        icons: ReportUtils.getIcons(report, personalDetails, Expensicons.FallbackAvatar, ReportUtils.isIOUReport(report)),
+        icons: ReportUtils.getIcons(report, personalDetails, Expensicons.FallbackAvatar),
         displayName: ReportUtils.getReportName(report),
         subtitle,
     };
@@ -765,26 +755,50 @@ function getShareDestination(reportID, reports, personalDetails) {
  * @param {number} originalStatusNum
  */
 function cancelTask(taskReportID, taskTitle, originalStateNum, originalStatusNum) {
-    const message = `canceled task: ${taskTitle}`;
+    const message = `deleted task: ${taskTitle}`;
     const optimisticCancelReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASKCANCELLED, message);
     const optimisticReportActionID = optimisticCancelReportAction.reportActionID;
+    const taskReport = ReportUtils.getReport(taskReportID);
+    const parentReportAction = ReportActionsUtils.getParentReportAction(taskReport);
+    const parentReport = ReportUtils.getParentReport(taskReport);
+
+    const optimisticReportActions = {
+        [parentReportAction.reportActionID]: {
+            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+            previousMessage: parentReportAction.message,
+            message: [
+                {
+                    translationKey: '',
+                    type: 'COMMENT',
+                    html: '',
+                    text: '',
+                    isEdited: true,
+                    isDeletedParentAction: true,
+                },
+            ],
+            errors: null,
+            linkMetaData: [],
+        },
+    };
 
     const optimisticData = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${taskReportID}`,
             value: {
-                stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
-                statusNum: CONST.REPORT.STATUS.CLOSED,
+                lastVisibleActionCreated: optimisticCancelReportAction.created,
+                lastMessageText: message,
+                lastActorAccountID: optimisticCancelReportAction.actorAccountID,
+                updateReportInLHN: true,
+                isDeletedParentAction: true,
             },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${taskReportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${parentReport.reportID}`,
             value: {
-                lastVisibleActionCreated: optimisticCancelReportAction.created,
-                lastMessageText: message,
-                lastActorAccountID: optimisticCancelReportAction.actorAccountID,
+                lastMessageText: ReportActionsUtils.getLastVisibleMessage(parentReport.reportID, {[parentReportAction.reportActionID]: null}).lastMessageText,
+                lastVisibleActionCreated: ReportActionsUtils.getLastVisibleAction(parentReport.reportID, {[parentReportAction.reportActionID]: null}).created,
             },
         },
         {
@@ -794,6 +808,11 @@ function cancelTask(taskReportID, taskTitle, originalStateNum, originalStatusNum
                 [optimisticReportActionID]: optimisticCancelReportAction,
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReport.reportID}`,
+            value: optimisticReportActions,
+        },
     ];
 
     const successData = [
@@ -806,6 +825,15 @@ function cancelTask(taskReportID, taskTitle, originalStateNum, originalStatusNum
                 },
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReport.reportID}`,
+            value: {
+                [parentReportAction.reportActionID]: {
+                    pendingAction: null,
+                },
+            },
+        },
     ];
 
     const failureData = [
@@ -824,6 +852,15 @@ function cancelTask(taskReportID, taskTitle, originalStateNum, originalStatusNum
                 [optimisticReportActionID]: null,
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReport.reportID}`,
+            value: {
+                [parentReportAction.reportActionID]: {
+                    pendingAction: null,
+                },
+            },
+        },
     ];
 
     API.write('CancelTask', {cancelledTaskReportActionID: optimisticReportActionID, taskReportID}, {optimisticData, successData, failureData});
@@ -894,6 +931,35 @@ function clearEditTaskErrors(reportID) {
     });
 }
 
+/**
+ * @param {string} actionName
+ * @param {string} reportID
+ * @param {boolean} isCreateTaskAction
+ * @returns {string}
+ */
+function getTaskReportActionMessage(actionName, reportID, isCreateTaskAction) {
+    const report = ReportUtils.getReport(reportID);
+    if (isCreateTaskAction) {
+        return `task for ${report.reportName}`;
+    }
+    let taskStatusText = '';
+    switch (actionName) {
+        case CONST.REPORT.ACTIONS.TYPE.TASKCOMPLETED:
+            taskStatusText = Localize.translateLocal('task.messages.completed');
+            break;
+        case CONST.REPORT.ACTIONS.TYPE.TASKCANCELLED:
+            taskStatusText = Localize.translateLocal('task.messages.canceled');
+            break;
+        case CONST.REPORT.ACTIONS.TYPE.TASKREOPENED:
+            taskStatusText = Localize.translateLocal('task.messages.reopened');
+            break;
+        default:
+            taskStatusText = Localize.translateLocal('task.task');
+    }
+
+    return `${taskStatusText}`;
+}
+
 export {
     createTaskAndNavigate,
     editTaskAndNavigate,
@@ -915,4 +981,5 @@ export {
     getTaskAssigneeAccountID,
     clearEditTaskErrors,
     canModifyTask,
+    getTaskReportActionMessage,
 };
diff --git a/src/libs/actions/Transaction.js b/src/libs/actions/Transaction.ts
similarity index 66%
rename from src/libs/actions/Transaction.js
rename to src/libs/actions/Transaction.ts
index b16e8c8753ac..fe1bc1621cfa 100644
--- a/src/libs/actions/Transaction.js
+++ b/src/libs/actions/Transaction.ts
@@ -1,18 +1,21 @@
-import _ from 'underscore';
 import Onyx from 'react-native-onyx';
-import lodashGet from 'lodash/get';
 import lodashHas from 'lodash/has';
+import lodashClone from 'lodash/clone';
 import ONYXKEYS from '../../ONYXKEYS';
 import * as CollectionUtils from '../CollectionUtils';
 import * as API from '../API';
+import CONST from '../../CONST';
+import {RecentWaypoint, Transaction} from '../../types/onyx';
+import {WaypointCollection} from '../../types/onyx/Transaction';
+import * as TransactionUtils from '../TransactionUtils';
 
-let recentWaypoints = [];
+let recentWaypoints: RecentWaypoint[] = [];
 Onyx.connect({
     key: ONYXKEYS.NVP_RECENT_WAYPOINTS,
-    callback: (val) => (recentWaypoints = val || []),
+    callback: (val) => (recentWaypoints = val ?? []),
 });
 
-const allTransactions = {};
+const allTransactions: Record<string, Transaction> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.TRANSACTION,
     callback: (transaction, key) => {
@@ -24,10 +27,7 @@ Onyx.connect({
     },
 });
 
-/**
- * @param {String} transactionID
- */
-function createInitialWaypoints(transactionID) {
+function createInitialWaypoints(transactionID: string) {
     Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {
         comment: {
             waypoints: {
@@ -40,14 +40,11 @@ function createInitialWaypoints(transactionID) {
 
 /**
  * Add a stop to the transaction
- *
- * @param {String} transactionID
- * @param {Number} newLastIndex
  */
-function addStop(transactionID) {
-    const transaction = lodashGet(allTransactions, transactionID, {});
-    const existingWaypoints = lodashGet(transaction, 'comment.waypoints', {});
-    const newLastIndex = _.size(existingWaypoints);
+function addStop(transactionID: string) {
+    const transaction = allTransactions?.[transactionID] ?? {};
+    const existingWaypoints = transaction?.comment?.waypoints ?? {};
+    const newLastIndex = Object.keys(existingWaypoints).length;
 
     Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {
         comment: {
@@ -55,26 +52,14 @@ function addStop(transactionID) {
                 [`waypoint${newLastIndex}`]: {},
             },
         },
-
-        // Clear the existing route so that we don't show an old route
-        routes: {
-            route0: {
-                geometry: {
-                    coordinates: null,
-                },
-            },
-        },
     });
 }
 
-/**
- * Saves the selected waypoint to the transaction
- * @param {String} transactionID
- * @param {String} index
- * @param {Object} waypoint
- */
-function saveWaypoint(transactionID, index, waypoint) {
+function saveWaypoint(transactionID: string, index: string, waypoint: RecentWaypoint | null, isEditingWaypoint = false) {
     Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {
+        pendingFields: {
+            comment: isEditingWaypoint ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE : CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+        },
         comment: {
             waypoints: {
                 [`waypoint${index}`]: waypoint,
@@ -101,32 +86,31 @@ function saveWaypoint(transactionID, index, waypoint) {
     if (!lodashHas(waypoint, 'lat') || !lodashHas(waypoint, 'lng')) {
         return;
     }
-
-    const recentWaypointAlreadyExists = _.find(recentWaypoints, (recentWaypoint) => recentWaypoint.address === waypoint.address);
-    if (!recentWaypointAlreadyExists) {
-        const clonedWaypoints = _.clone(recentWaypoints);
+    const recentWaypointAlreadyExists = recentWaypoints.find((recentWaypoint) => recentWaypoint?.address === waypoint?.address);
+    if (!recentWaypointAlreadyExists && waypoint !== null) {
+        const clonedWaypoints = lodashClone(recentWaypoints);
         clonedWaypoints.unshift(waypoint);
         Onyx.merge(ONYXKEYS.NVP_RECENT_WAYPOINTS, clonedWaypoints.slice(0, 5));
     }
 }
 
-function removeWaypoint(transactionID, currentIndex) {
+function removeWaypoint(transactionID: string, currentIndex: string) {
     // Index comes from the route params and is a string
     const index = Number(currentIndex);
-    const transaction = lodashGet(allTransactions, transactionID, {});
-    const existingWaypoints = lodashGet(transaction, 'comment.waypoints', {});
-    const totalWaypoints = _.size(existingWaypoints);
-
+    const transaction = allTransactions?.[transactionID] ?? {};
+    const existingWaypoints = transaction?.comment?.waypoints ?? {};
+    const totalWaypoints = Object.keys(existingWaypoints).length;
     // Prevents removing the starting or ending waypoint but clear the stored address only if there are only two waypoints
     if (totalWaypoints === 2 && (index === 0 || index === totalWaypoints - 1)) {
-        saveWaypoint(transactionID, index, null);
+        saveWaypoint(transactionID, index.toString(), null);
         return;
     }
 
-    const waypointValues = _.values(existingWaypoints);
-    waypointValues.splice(index, 1);
+    const waypointValues = Object.values(existingWaypoints);
+    const removed = waypointValues.splice(index, 1);
+    const isRemovedWaypointEmpty = removed.length > 0 && !TransactionUtils.waypointHasValidAddress(removed[0] ?? {});
 
-    const reIndexedWaypoints = {};
+    const reIndexedWaypoints: WaypointCollection = {};
     waypointValues.forEach((waypoint, idx) => {
         reIndexedWaypoints[`waypoint${idx}`] = waypoint;
     });
@@ -134,31 +118,40 @@ function removeWaypoint(transactionID, currentIndex) {
     // Onyx.merge won't remove the null nested object values, this is a workaround
     // to remove nested keys while also preserving other object keys
     // Doing a deep clone of the transaction to avoid mutating the original object and running into a cache issue when using Onyx.set
-    const newTransaction = {
+    let newTransaction: Transaction = {
         ...transaction,
         comment: {
             ...transaction.comment,
             waypoints: reIndexedWaypoints,
         },
-        // Clear the existing route so that we don't show an old route
-        routes: {
-            route0: {
-                geometry: {
-                    coordinates: null,
+    };
+
+    if (!isRemovedWaypointEmpty) {
+        newTransaction = {
+            ...newTransaction,
+            // Clear any errors that may be present, which apply to the old route
+            errorFields: {
+                route: null,
+            },
+            // Clear the existing route so that we don't show an old route
+            routes: {
+                route0: {
+                    distance: null,
+                    geometry: {
+                        coordinates: null,
+                    },
                 },
             },
-        },
-    };
+        };
+    }
     Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, newTransaction);
 }
 
 /**
  * Gets the route for a set of waypoints
  * Used so we can generate a map view of the provided waypoints
- * @param {String} transactionID
- * @param {Object} waypoints
  */
-function getRoute(transactionID, waypoints) {
+function getRoute(transactionID: string, waypoints: WaypointCollection) {
     API.read(
         'GetRoute',
         {
diff --git a/src/libs/actions/TransactionEdit.js b/src/libs/actions/TransactionEdit.js
new file mode 100644
index 000000000000..44b489b72c43
--- /dev/null
+++ b/src/libs/actions/TransactionEdit.js
@@ -0,0 +1,38 @@
+import Onyx from 'react-native-onyx';
+import ONYXKEYS from '../../ONYXKEYS';
+
+/**
+ * Makes a backup copy of a transaction object that can be restored when the user cancels editing a transaction.
+ *
+ * @param {Object} transaction
+ */
+function createBackupTransaction(transaction) {
+    const newTransaction = {
+        ...transaction,
+    };
+    // Use set so that it will always fully overwrite any backup transaction that could have existed before
+    Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}-backup`, newTransaction);
+}
+
+/**
+ * Removes a transaction from Onyx that was only used temporary in the edit flow
+ * @param {String} transactionID
+ */
+function removeBackupTransaction(transactionID) {
+    Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}-backup`, null);
+}
+
+function restoreOriginalTransactionFromBackup(transactionID) {
+    const connectionID = Onyx.connect({
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}-backup`,
+        callback: (backupTransaction) => {
+            Onyx.disconnect(connectionID);
+
+            // Use set to completely overwrite the original transaction
+            Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, backupTransaction);
+            removeBackupTransaction(transactionID);
+        },
+    });
+}
+
+export {createBackupTransaction, removeBackupTransaction, restoreOriginalTransactionFromBackup};
diff --git a/src/libs/actions/TwoFactorAuthActions.js b/src/libs/actions/TwoFactorAuthActions.ts
similarity index 85%
rename from src/libs/actions/TwoFactorAuthActions.js
rename to src/libs/actions/TwoFactorAuthActions.ts
index 3bc64b8ada4c..0cec7d3c16c8 100644
--- a/src/libs/actions/TwoFactorAuthActions.js
+++ b/src/libs/actions/TwoFactorAuthActions.ts
@@ -2,6 +2,7 @@ import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';
 import Navigation from '../Navigation/Navigation';
 import ROUTES from '../../ROUTES';
+import {TwoFactorAuthStep} from '../../types/onyx/Account';
 
 /**
  * Clear 2FA data if the flow is interrupted without finishing
@@ -9,8 +10,7 @@ import ROUTES from '../../ROUTES';
 function clearTwoFactorAuthData() {
     Onyx.merge(ONYXKEYS.ACCOUNT, {recoveryCodes: '', twoFactorAuthSecretKey: '', twoFactorAuthStep: '', codesAreCopied: false});
 }
-
-function setTwoFactorAuthStep(twoFactorAuthStep) {
+function setTwoFactorAuthStep(twoFactorAuthStep: TwoFactorAuthStep) {
     Onyx.merge(ONYXKEYS.ACCOUNT, {twoFactorAuthStep});
 }
 
diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js
index ee93c6acb1e5..1830d1e51f6f 100644
--- a/src/libs/actions/User.js
+++ b/src/libs/actions/User.js
@@ -8,8 +8,6 @@ import CONST from '../../CONST';
 import Navigation from '../Navigation/Navigation';
 import ROUTES from '../../ROUTES';
 import * as Pusher from '../Pusher/pusher';
-import Growl from '../Growl';
-import * as Localize from '../Localize';
 import * as Link from './Link';
 import * as SequentialQueue from '../Network/SequentialQueue';
 import PusherUtils from '../PusherUtils';
@@ -19,6 +17,7 @@ import * as ErrorUtils from '../ErrorUtils';
 import * as Session from './Session';
 import * as PersonalDetails from './PersonalDetails';
 import * as OnyxUpdates from './OnyxUpdates';
+import redirectToSignIn from './SignInRedirect';
 
 let currentUserAccountID = '';
 let currentEmail = '';
@@ -70,6 +69,8 @@ function closeAccount(message) {
             ],
         },
     );
+    // Run cleanup actions to prevent reconnection callbacks from blocking logging in again
+    redirectToSignIn();
 }
 
 /**
@@ -462,64 +463,6 @@ function isBlockedFromConcierge(blockedFromConciergeNVP) {
     return moment().isBefore(moment(blockedFromConciergeNVP.expiresAt), 'day');
 }
 
-/**
- * Adds a paypal.me address for the user
- *
- * @param {String} address
- */
-function addPaypalMeAddress(address) {
-    const optimisticData = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.PAYPAL,
-            value: {
-                title: 'PayPal.me',
-                description: address,
-                methodID: CONST.PAYMENT_METHODS.PAYPAL,
-                key: 'payPalMePaymentMethod',
-                accountType: CONST.PAYMENT_METHODS.PAYPAL,
-                accountData: {
-                    username: address,
-                },
-                isDefault: false,
-            },
-        },
-    ];
-    API.write(
-        'AddPaypalMeAddress',
-        {
-            value: address,
-        },
-        {optimisticData},
-    );
-}
-
-/**
- * Deletes a paypal.me address for the user
- *
- */
-function deletePaypalMeAddress() {
-    const optimisticData = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.PAYPAL,
-            value: {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE},
-        },
-    ];
-
-    // Success data required for Android, more info here https://github.com/Expensify/App/pull/17903#discussion_r1175763081
-    const successData = [
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: ONYXKEYS.PAYPAL,
-            value: {},
-        },
-    ];
-
-    API.write('DeletePaypalMeAddress', {}, {optimisticData, successData});
-    Growl.show(Localize.translateLocal('walletPage.deletePayPalSuccess'), CONST.GROWL.SUCCESS, 3000);
-}
-
 function triggerNotifications(onyxUpdates) {
     _.each(onyxUpdates, (update) => {
         if (!update.shouldNotify) {
@@ -528,8 +471,10 @@ function triggerNotifications(onyxUpdates) {
 
         const reportID = update.key.replace(ONYXKEYS.COLLECTION.REPORT_ACTIONS, '');
         const reportActions = _.values(update.value);
-        const sortedReportActions = ReportActionsUtils.getSortedReportActions(reportActions);
-        Report.showReportActionNotification(reportID, _.last(sortedReportActions));
+
+        // eslint-disable-next-line rulesdir/no-negated-variables
+        const notifiableActions = _.filter(reportActions, (action) => ReportActionsUtils.isNotifiableReportAction(action));
+        _.each(notifiableActions, (action) => Report.showReportActionNotification(reportID, action));
     });
 }
 
@@ -842,7 +787,6 @@ function updateTheme(theme) {
  * @param {Object} status
  * @param {String} status.text
  * @param {String} status.emojiCode
- * @param {String} status.clearAfter - ISO 8601 format string, which represents the time when the status should be cleared
  */
 function updateCustomStatus(status) {
     API.write('UpdateStatus', status, {
@@ -918,8 +862,6 @@ export {
     joinScreenShare,
     clearScreenShareRequest,
     generateStatementPDF,
-    deletePaypalMeAddress,
-    addPaypalMeAddress,
     updateChatPriorityMode,
     setContactMethodAsDefault,
     updateTheme,
diff --git a/src/libs/actions/Welcome.js b/src/libs/actions/Welcome.js
index 6e6fe2512dff..8e1832edb9a7 100644
--- a/src/libs/actions/Welcome.js
+++ b/src/libs/actions/Welcome.js
@@ -134,7 +134,7 @@ function show({routes, showCreateMenu = () => {}, showPopoverMenu = () => {}}) {
         }
 
         if (shouldNavigateToWorkspaceChat && workspaceChatReport) {
-            Navigation.navigate(ROUTES.getReportRoute(workspaceChatReport.reportID));
+            Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(workspaceChatReport.reportID));
 
             // If showPopoverMenu exists and returns true then it opened the Popover Menu successfully, and we can update isFirstTimeNewExpensifyUser
             // so the Welcome logic doesn't run again
diff --git a/src/libs/addEncryptedAuthTokenToURL.js b/src/libs/addEncryptedAuthTokenToURL.ts
similarity index 58%
rename from src/libs/addEncryptedAuthTokenToURL.js
rename to src/libs/addEncryptedAuthTokenToURL.ts
index 827454fa2aa3..9bdb83c284ce 100644
--- a/src/libs/addEncryptedAuthTokenToURL.js
+++ b/src/libs/addEncryptedAuthTokenToURL.ts
@@ -1,19 +1,15 @@
-import lodashGet from 'lodash/get';
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../ONYXKEYS';
 
 let encryptedAuthToken = '';
 Onyx.connect({
     key: ONYXKEYS.SESSION,
-    callback: (session) => (encryptedAuthToken = lodashGet(session, 'encryptedAuthToken', '')),
+    callback: (session) => (encryptedAuthToken = session?.encryptedAuthToken ?? ''),
 });
 
 /**
  * Add encryptedAuthToken to this attachment URL
- *
- * @param {String} url
- * @returns {String}
  */
-export default function (url) {
+export default function (url: string) {
     return `${url}?encryptedAuthToken=${encodeURIComponent(encryptedAuthToken)}`;
 }
diff --git a/src/libs/asyncOpenURL/index.js b/src/libs/asyncOpenURL/index.ts
similarity index 60%
rename from src/libs/asyncOpenURL/index.js
rename to src/libs/asyncOpenURL/index.ts
index e69777c5483c..5307049ee923 100644
--- a/src/libs/asyncOpenURL/index.js
+++ b/src/libs/asyncOpenURL/index.ts
@@ -1,6 +1,7 @@
 import {Linking} from 'react-native';
+import AsyncOpenURL from './types';
 
-export default function asyncOpenURL(promise, url) {
+const asyncOpenURL: AsyncOpenURL = (promise, url) => {
     if (!url) {
         return;
     }
@@ -8,4 +9,6 @@ export default function asyncOpenURL(promise, url) {
     promise.then((params) => {
         Linking.openURL(typeof url === 'string' ? url : url(params));
     });
-}
+};
+
+export default asyncOpenURL;
diff --git a/src/libs/asyncOpenURL/index.website.js b/src/libs/asyncOpenURL/index.website.ts
similarity index 61%
rename from src/libs/asyncOpenURL/index.website.js
rename to src/libs/asyncOpenURL/index.website.ts
index e1c491450c18..d503644c1392 100644
--- a/src/libs/asyncOpenURL/index.website.js
+++ b/src/libs/asyncOpenURL/index.website.ts
@@ -1,13 +1,11 @@
 import {Linking} from 'react-native';
+import AsyncOpenURL from './types';
 
 /**
  * Prevents Safari from blocking pop-up window when opened within async call.
- *
- * @param {Promise} promise
- * @param {string}  url
- * @param {Boolean} shouldSkipCustomSafariLogic When true, we will use `Linking.openURL` even if the browser is Safari.
+ * @param shouldSkipCustomSafariLogic When true, we will use `Linking.openURL` even if the browser is Safari.
  */
-export default function asyncOpenURL(promise, url, shouldSkipCustomSafariLogic) {
+const asyncOpenURL: AsyncOpenURL = (promise, url, shouldSkipCustomSafariLogic) => {
     if (!url) {
         return;
     }
@@ -22,8 +20,13 @@ export default function asyncOpenURL(promise, url, shouldSkipCustomSafariLogic)
         const windowRef = window.open();
         promise
             .then((params) => {
+                if (!windowRef) {
+                    return;
+                }
                 windowRef.location = typeof url === 'string' ? url : url(params);
             })
-            .catch(() => windowRef.close());
+            .catch(() => windowRef?.close());
     }
-}
+};
+
+export default asyncOpenURL;
diff --git a/src/libs/asyncOpenURL/types.ts b/src/libs/asyncOpenURL/types.ts
new file mode 100644
index 000000000000..bf24756b0cc2
--- /dev/null
+++ b/src/libs/asyncOpenURL/types.ts
@@ -0,0 +1,3 @@
+type AsyncOpenURL = <T>(promise: Promise<T>, url: string | ((params: T) => string), shouldSkipCustomSafariLogic?: boolean) => void;
+
+export default AsyncOpenURL;
diff --git a/src/libs/calculateAnchorPosition.js b/src/libs/calculateAnchorPosition.js
deleted file mode 100644
index c886c9ac3712..000000000000
--- a/src/libs/calculateAnchorPosition.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import lodashGet from 'lodash/get';
-import CONST from '../CONST';
-
-/**
- * Gets the x,y position of the passed in component for the purpose of anchoring another component to it.
- *
- * @param {Element} anchorComponent
- * @param {{horizontal: string, vertical: string}} anchorOriginValue - Optional parameter
- * @return {Promise<unknown>}
- */
-export default function calculateAnchorPosition(anchorComponent, anchorOriginValue) {
-    return new Promise((resolve) => {
-        if (!anchorComponent) {
-            return resolve({horizontal: 0, vertical: 0});
-        }
-        anchorComponent.measureInWindow((x, y, width, height) => {
-            if (
-                lodashGet(anchorOriginValue, 'vertical') === CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP &&
-                lodashGet(anchorOriginValue, 'horizontal') === CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT
-            ) {
-                return resolve({horizontal: x, vertical: y + height + lodashGet(anchorOriginValue, 'shiftVertical', 0)});
-            }
-            return resolve({horizontal: x + width, vertical: y});
-        });
-    });
-}
diff --git a/src/libs/calculateAnchorPosition.ts b/src/libs/calculateAnchorPosition.ts
new file mode 100644
index 000000000000..39fb3032ee09
--- /dev/null
+++ b/src/libs/calculateAnchorPosition.ts
@@ -0,0 +1,32 @@
+/* eslint-disable no-console */
+import {ValueOf} from 'type-fest';
+import {View} from 'react-native';
+import CONST from '../CONST';
+
+type AnchorOrigin = {
+    horizontal: ValueOf<typeof CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL>;
+    vertical: ValueOf<typeof CONST.MODAL.ANCHOR_ORIGIN_VERTICAL>;
+    shiftVertical?: number;
+};
+
+type AnchorPosition = {
+    horizontal: number;
+    vertical: number;
+};
+
+/**
+ * Gets the x,y position of the passed in component for the purpose of anchoring another component to it.
+ */
+export default function calculateAnchorPosition(anchorComponent: View, anchorOrigin?: AnchorOrigin): Promise<AnchorPosition> {
+    return new Promise((resolve) => {
+        if (!anchorComponent) {
+            return resolve({horizontal: 0, vertical: 0});
+        }
+        anchorComponent.measureInWindow((x, y, width, height) => {
+            if (anchorOrigin?.vertical === CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP && anchorOrigin?.horizontal === CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT) {
+                return resolve({horizontal: x, vertical: y + height + (anchorOrigin?.shiftVertical ?? 0)});
+            }
+            return resolve({horizontal: x + width, vertical: y});
+        });
+    });
+}
diff --git a/src/libs/convertToLTR/index.android.ts b/src/libs/convertToLTR/index.android.ts
index 579cbc6d13fa..3a4755b1710f 100644
--- a/src/libs/convertToLTR/index.android.ts
+++ b/src/libs/convertToLTR/index.android.ts
@@ -1,9 +1,10 @@
+import CONST from '../../CONST';
 import ConvertToLTR from './types';
 
 /**
  * Android only - convert RTL text to a LTR text using Unicode controls.
  * https://www.w3.org/International/questions/qa-bidi-unicode-controls
  */
-const convertToLTR: ConvertToLTR = (text) => `\u2066${text}`;
+const convertToLTR: ConvertToLTR = (text) => `${CONST.UNICODE.LTR}${text}`;
 
 export default convertToLTR;
diff --git a/src/libs/cropOrRotateImage/index.native.js b/src/libs/cropOrRotateImage/index.native.ts
similarity index 71%
rename from src/libs/cropOrRotateImage/index.native.js
rename to src/libs/cropOrRotateImage/index.native.ts
index c1e21879f2be..08a5ecb04f6b 100644
--- a/src/libs/cropOrRotateImage/index.native.js
+++ b/src/libs/cropOrRotateImage/index.native.ts
@@ -1,16 +1,12 @@
 import RNImageManipulator from '@oguzhnatly/react-native-image-manipulator';
 import RNFetchBlob from 'react-native-blob-util';
+import {CropOrRotateImage} from './types';
 
 /**
  * Crops and rotates the image on ios/android
- *
- * @param {String} uri
- * @param {Array<Object>} actions
- * @param {Object} options
- * @returns {Promise<Object>} Returns cropped and rotated image
  */
-function cropOrRotateImage(uri, actions, options = {}) {
-    return new Promise((resolve) => {
+const cropOrRotateImage: CropOrRotateImage = (uri, actions, options) =>
+    new Promise((resolve) => {
         RNImageManipulator.manipulate(uri, actions, options).then((result) => {
             RNFetchBlob.fs.stat(result.uri.replace('file://', '')).then(({size}) => {
                 resolve({
@@ -22,6 +18,5 @@ function cropOrRotateImage(uri, actions, options = {}) {
             });
         });
     });
-}
 
 export default cropOrRotateImage;
diff --git a/src/libs/cropOrRotateImage/index.js b/src/libs/cropOrRotateImage/index.ts
similarity index 54%
rename from src/libs/cropOrRotateImage/index.js
rename to src/libs/cropOrRotateImage/index.ts
index ec19aff7c7e3..6b222c9759b5 100644
--- a/src/libs/cropOrRotateImage/index.js
+++ b/src/libs/cropOrRotateImage/index.ts
@@ -1,14 +1,14 @@
-import _ from 'underscore';
+import {CropOptions, CropOrRotateImage, CropOrRotateImageOptions, FileWithUri} from './types';
+
+type SizeFromAngle = {
+    width: number;
+    height: number;
+};
 
 /**
  * Calculates a size of canvas after rotation
- *
- * @param {Number} width
- * @param {Number} height
- * @param {Number} angle
- * @returns {Object} Returns width and height of new canvas
  */
-function sizeFromAngle(width, height, angle) {
+function sizeFromAngle(width: number, height: number, angle: number): SizeFromAngle {
     const radians = (angle * Math.PI) / 180;
     let sine = Math.cos(radians);
     let cosine = Math.sin(radians);
@@ -23,12 +23,8 @@ function sizeFromAngle(width, height, angle) {
 
 /**
  * Creates a new rotated canvas
- *
- * @param {Object} canvas
- * @param {Number} degrees
- * @returns {Object}
  */
-function rotateCanvas(canvas, degrees) {
+function rotateCanvas(canvas: HTMLCanvasElement, degrees: number): HTMLCanvasElement {
     const {width, height} = sizeFromAngle(canvas.width, canvas.height, degrees);
 
     // We have to create a new canvas because it is not possible to change already drawn
@@ -38,28 +34,24 @@ function rotateCanvas(canvas, degrees) {
     result.height = height;
 
     const context = result.getContext('2d');
+    if (context) {
+        // In order to rotate image along its center we have to apply next transformation
+        context.translate(result.width / 2, result.height / 2);
 
-    // In order to rotate image along its center we have to apply next transformation
-    context.translate(result.width / 2, result.height / 2);
-
-    const radians = (degrees * Math.PI) / 180;
-    context.rotate(radians);
-
-    context.drawImage(canvas, -canvas.width / 2, -canvas.height / 2, canvas.width, canvas.height);
+        const radians = (degrees * Math.PI) / 180;
+        context.rotate(radians);
 
+        context.drawImage(canvas, -canvas.width / 2, -canvas.height / 2, canvas.width, canvas.height);
+    }
     return result;
 }
 
 /**
  * Creates new cropped canvas and returns it
- *
- * @param {Object} canvas
- * @param {Object} options
- * @returns {Object}
  */
-function cropCanvas(canvas, options) {
+function cropCanvas(canvas: HTMLCanvasElement, options: CropOptions) {
     let {originX = 0, originY = 0, width = 0, height = 0} = options;
-    const clamp = (value, max) => Math.max(0, Math.min(max, value));
+    const clamp = (value: number, max: number) => Math.max(0, Math.min(max, value));
 
     width = clamp(width, canvas.width);
     height = clamp(height, canvas.height);
@@ -74,20 +66,18 @@ function cropCanvas(canvas, options) {
     result.height = height;
 
     const context = result.getContext('2d');
-    context.drawImage(canvas, originX, originY, width, height, 0, 0, width, height);
+    context?.drawImage(canvas, originX, originY, width, height, 0, 0, width, height);
 
     return result;
 }
 
-/**
- * @param {Object} canvas
- * @param {Object} options
- * @returns {Promise<File>}
- */
-function convertCanvasToFile(canvas, options = {}) {
+function convertCanvasToFile(canvas: HTMLCanvasElement, options: CropOrRotateImageOptions): Promise<FileWithUri> {
     return new Promise((resolve) => {
         canvas.toBlob((blob) => {
-            const file = new File([blob], options.name || 'fileName.jpeg', {type: options.type || 'image/jpeg'});
+            if (!blob) {
+                return;
+            }
+            const file = new File([blob], options.name || 'fileName.jpeg', {type: options.type || 'image/jpeg'}) as FileWithUri;
             file.uri = URL.createObjectURL(file);
             resolve(file);
         });
@@ -96,11 +86,8 @@ function convertCanvasToFile(canvas, options = {}) {
 
 /**
  * Loads image from specified url
- *
- * @param {String} uri
- * @returns {Promise<Object>}
  */
-function loadImageAsync(uri) {
+function loadImageAsync(uri: string): Promise<HTMLCanvasElement> {
     return new Promise((resolve, reject) => {
         const imageSource = new Image();
         imageSource.crossOrigin = 'anonymous';
@@ -110,7 +97,7 @@ function loadImageAsync(uri) {
             canvas.height = imageSource.naturalHeight;
 
             const context = canvas.getContext('2d');
-            context.drawImage(imageSource, 0, 0, imageSource.naturalWidth, imageSource.naturalHeight);
+            context?.drawImage(imageSource, 0, 0, imageSource.naturalWidth, imageSource.naturalHeight);
 
             resolve(canvas);
         };
@@ -121,30 +108,20 @@ function loadImageAsync(uri) {
 
 /**
  * Crops and rotates the image on web
- *
- * @param {String} uri
- * @param {Object} actions
- * @param {Object} options
- * @returns {Promise<Object>} Returns cropped and rotated image
  */
-function cropOrRotateImage(uri, actions, options) {
-    return loadImageAsync(uri).then((originalCanvas) => {
-        const resultCanvas = _.reduce(
-            actions,
-            (canvas, action) => {
-                if ('crop' in action) {
-                    return cropCanvas(canvas, action.crop);
-                }
-                if ('rotate' in action) {
-                    return rotateCanvas(canvas, action.rotate);
-                }
-                return canvas;
-            },
-            originalCanvas,
-        );
 
+const cropOrRotateImage: CropOrRotateImage = (uri, actions, options) =>
+    loadImageAsync(uri).then((originalCanvas) => {
+        const resultCanvas = actions.reduce((canvas, action) => {
+            if (action.crop) {
+                return cropCanvas(canvas, action.crop);
+            }
+            if (action.rotate) {
+                return rotateCanvas(canvas, action.rotate);
+            }
+            return canvas;
+        }, originalCanvas);
         return convertCanvasToFile(resultCanvas, options);
     });
-}
 
 export default cropOrRotateImage;
diff --git a/src/libs/cropOrRotateImage/types.ts b/src/libs/cropOrRotateImage/types.ts
new file mode 100644
index 000000000000..6abbdab49ea5
--- /dev/null
+++ b/src/libs/cropOrRotateImage/types.ts
@@ -0,0 +1,29 @@
+import {RNImageManipulatorResult} from '@oguzhnatly/react-native-image-manipulator';
+
+type CropOrRotateImageOptions = {
+    type: string;
+    name: string;
+    compress: number;
+};
+
+type CropOptions = {
+    originX: number;
+    originY: number;
+    width: number;
+    height: number;
+};
+
+type Action = {
+    crop?: CropOptions;
+    rotate?: number;
+};
+
+type FileWithUri = File & {
+    uri: string;
+};
+
+type CustomRNImageManipulatorResult = RNImageManipulatorResult & {size: number; type: string; name: string};
+
+type CropOrRotateImage = (uri: string, actions: Action[], options: CropOrRotateImageOptions) => Promise<FileWithUri | CustomRNImageManipulatorResult>;
+
+export type {CropOrRotateImage, CropOptions, Action, FileWithUri, CropOrRotateImageOptions};
diff --git a/src/libs/fileDownload/index.android.js b/src/libs/fileDownload/index.android.js
index c19301cbde49..c3528b579f67 100644
--- a/src/libs/fileDownload/index.android.js
+++ b/src/libs/fileDownload/index.android.js
@@ -68,7 +68,9 @@ function handleDownload(url, fileName) {
                     return Promise.reject();
                 }
 
-                if (!isLocalFile) attachmentPath = attachment.path();
+                if (!isLocalFile) {
+                    attachmentPath = attachment.path();
+                }
 
                 return RNFetchBlob.MediaCollection.copyToMediaStore(
                     {
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/focusWithDelay.js b/src/libs/focusWithDelay.ts
similarity index 72%
rename from src/libs/focusWithDelay.js
rename to src/libs/focusWithDelay.ts
index 367cc2b92f9f..00d0e915879e 100644
--- a/src/libs/focusWithDelay.js
+++ b/src/libs/focusWithDelay.ts
@@ -1,15 +1,14 @@
-import {InteractionManager} from 'react-native';
+import {InteractionManager, TextInput} from 'react-native';
 import ComposerFocusManager from './ComposerFocusManager';
 
+type FocusWithDelay = (shouldDelay?: boolean) => void;
 /**
  * Create a function that focuses a text input.
- * @param {Object} textInput the text input to focus
- * @returns {Function} a function that focuses the text input with a configurable delay
  */
-function focusWithDelay(textInput) {
+function focusWithDelay(textInput: TextInput | null): FocusWithDelay {
     /**
      * Focus the text input
-     * @param {Boolean} [shouldDelay=false] Impose delay before focusing the text input
+     * @param [shouldDelay] Impose delay before focusing the text input
      */
     return (shouldDelay = false) => {
         // There could be other animations running while we trigger manual focus.
@@ -18,6 +17,7 @@ function focusWithDelay(textInput) {
             if (!textInput) {
                 return;
             }
+
             if (!shouldDelay) {
                 textInput.focus();
                 return;
diff --git a/src/libs/getComponentDisplayName.js b/src/libs/getComponentDisplayName.js
deleted file mode 100644
index 4c643bff1bfa..000000000000
--- a/src/libs/getComponentDisplayName.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Returns the display name of a component
- *
- * @param {object} component
- * @returns {string}
- */
-export default function getComponentDisplayName(component) {
-    return component.displayName || component.name || 'Component';
-}
diff --git a/src/libs/getComponentDisplayName.ts b/src/libs/getComponentDisplayName.ts
new file mode 100644
index 000000000000..fd1bbcaea521
--- /dev/null
+++ b/src/libs/getComponentDisplayName.ts
@@ -0,0 +1,6 @@
+import {ComponentType} from 'react';
+
+/** Returns the display name of a component */
+export default function getComponentDisplayName(component: ComponentType): string {
+    return component.displayName ?? component.name ?? 'Component';
+}
diff --git a/src/libs/getOperatingSystem/index.native.js b/src/libs/getOperatingSystem/index.native.ts
similarity index 72%
rename from src/libs/getOperatingSystem/index.native.js
rename to src/libs/getOperatingSystem/index.native.ts
index fce2857548f1..38b87f4983b7 100644
--- a/src/libs/getOperatingSystem/index.native.js
+++ b/src/libs/getOperatingSystem/index.native.ts
@@ -1,11 +1,11 @@
 import {Platform} from 'react-native';
 import CONST from '../../CONST';
+import GetOperatingSystem from './types';
 
 /**
  * Reads the current operating system for native platforms.
- * @return {String | null}
  */
-export default () => {
+const getOperatingSystem: GetOperatingSystem = () => {
     switch (Platform.OS) {
         case 'ios':
             return CONST.OS.IOS;
@@ -15,3 +15,5 @@ export default () => {
             return CONST.OS.NATIVE;
     }
 };
+
+export default getOperatingSystem;
diff --git a/src/libs/getOperatingSystem/index.js b/src/libs/getOperatingSystem/index.ts
similarity index 69%
rename from src/libs/getOperatingSystem/index.js
rename to src/libs/getOperatingSystem/index.ts
index d1ffac6defa7..7adfa27c45fc 100644
--- a/src/libs/getOperatingSystem/index.js
+++ b/src/libs/getOperatingSystem/index.ts
@@ -1,22 +1,21 @@
-import _ from 'underscore';
 import CONST from '../../CONST';
+import GetOperatingSystem from './types';
 
 /**
  * Reads the current operating system when running on Web/Mobile-Web/Desktop
- * @return {String | null}
  */
-export default () => {
+const getOperatingSystem: GetOperatingSystem = () => {
     const {userAgent, platform} = window.navigator;
     const macosPlatforms = ['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K'];
     const windowsPlatforms = ['Win32', 'Win64', 'Windows', 'WinCE'];
     const iosPlatforms = ['iPhone', 'iPad', 'iPod'];
 
     let os = null;
-    if (_.contains(macosPlatforms, platform)) {
+    if (macosPlatforms.includes(platform)) {
         os = CONST.OS.MAC_OS;
-    } else if (_.contains(iosPlatforms, platform)) {
+    } else if (iosPlatforms.includes(platform)) {
         os = CONST.OS.IOS;
-    } else if (_.contains(windowsPlatforms, platform)) {
+    } else if (windowsPlatforms.includes(platform)) {
         os = CONST.OS.WINDOWS;
     } else if (/Android/.test(userAgent)) {
         os = CONST.OS.ANDROID;
@@ -25,3 +24,5 @@ export default () => {
     }
     return os;
 };
+
+export default getOperatingSystem;
diff --git a/src/libs/getOperatingSystem/types.ts b/src/libs/getOperatingSystem/types.ts
new file mode 100644
index 000000000000..64bb103db083
--- /dev/null
+++ b/src/libs/getOperatingSystem/types.ts
@@ -0,0 +1,7 @@
+import {ValueOf} from 'type-fest';
+import CONST from '../../CONST';
+
+type OS = ValueOf<typeof CONST.OS> | null;
+type GetOperatingSystem = () => OS;
+
+export default GetOperatingSystem;
diff --git a/src/libs/getPlaidLinkTokenParameters/index.android.js b/src/libs/getPlaidLinkTokenParameters/index.android.js
deleted file mode 100644
index 4174e2b8905b..000000000000
--- a/src/libs/getPlaidLinkTokenParameters/index.android.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import CONST from '../../CONST';
-
-export default () => ({android_package: CONST.ANDROID_PACKAGE_NAME});
diff --git a/src/libs/getPlaidLinkTokenParameters/index.android.ts b/src/libs/getPlaidLinkTokenParameters/index.android.ts
new file mode 100644
index 000000000000..39d444abdba2
--- /dev/null
+++ b/src/libs/getPlaidLinkTokenParameters/index.android.ts
@@ -0,0 +1,8 @@
+import CONST from '../../CONST';
+import GetPlaidLinkTokenParameters from './types';
+
+const getPlaidLinkTokenParameters: GetPlaidLinkTokenParameters = () => ({
+    androidPackage: CONST.ANDROID_PACKAGE_NAME,
+});
+
+export default getPlaidLinkTokenParameters;
diff --git a/src/libs/getPlaidLinkTokenParameters/index.ios.js b/src/libs/getPlaidLinkTokenParameters/index.ios.js
deleted file mode 100644
index 88032c582d17..000000000000
--- a/src/libs/getPlaidLinkTokenParameters/index.ios.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import CONFIG from '../../CONFIG';
-
-export default () => ({redirect_uri: `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}partners/plaid/oauth_ios`});
diff --git a/src/libs/getPlaidLinkTokenParameters/index.ios.ts b/src/libs/getPlaidLinkTokenParameters/index.ios.ts
new file mode 100644
index 000000000000..330efad4839a
--- /dev/null
+++ b/src/libs/getPlaidLinkTokenParameters/index.ios.ts
@@ -0,0 +1,8 @@
+import CONFIG from '../../CONFIG';
+import GetPlaidLinkTokenParameters from './types';
+
+const getPlaidLinkTokenParameters: GetPlaidLinkTokenParameters = () => ({
+    redirectURI: `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}partners/plaid/oauth_ios`,
+});
+
+export default getPlaidLinkTokenParameters;
diff --git a/src/libs/getPlaidLinkTokenParameters/index.js b/src/libs/getPlaidLinkTokenParameters/index.js
deleted file mode 100644
index cd15926ee3e6..000000000000
--- a/src/libs/getPlaidLinkTokenParameters/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import ROUTES from '../../ROUTES';
-import CONFIG from '../../CONFIG';
-
-export default () => {
-    const bankAccountRoute = window.location.href.includes('personal') ? ROUTES.BANK_ACCOUNT_PERSONAL : ROUTES.BANK_ACCOUNT;
-    return {redirect_uri: `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}${bankAccountRoute}`};
-};
diff --git a/src/libs/getPlaidLinkTokenParameters/index.ts b/src/libs/getPlaidLinkTokenParameters/index.ts
new file mode 100644
index 000000000000..e47629e85d09
--- /dev/null
+++ b/src/libs/getPlaidLinkTokenParameters/index.ts
@@ -0,0 +1,11 @@
+import ROUTES from '../../ROUTES';
+import CONFIG from '../../CONFIG';
+import GetPlaidLinkTokenParameters from './types';
+
+const getPlaidLinkTokenParameters: GetPlaidLinkTokenParameters = () => {
+    const bankAccountRoute = window.location.href.includes('personal') ? ROUTES.BANK_ACCOUNT_PERSONAL : ROUTES.BANK_ACCOUNT;
+
+    return {redirectURI: `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}${bankAccountRoute}`};
+};
+
+export default getPlaidLinkTokenParameters;
diff --git a/src/libs/getPlaidLinkTokenParameters/types.ts b/src/libs/getPlaidLinkTokenParameters/types.ts
new file mode 100644
index 000000000000..1fd0eb51017f
--- /dev/null
+++ b/src/libs/getPlaidLinkTokenParameters/types.ts
@@ -0,0 +1,10 @@
+type PlaidLinkTokenParameters = {
+    androidPackage?: string;
+    redirectURI?: string;
+    allowDebit?: boolean;
+    bankAccountID?: number;
+};
+
+type GetPlaidLinkTokenParameters = () => PlaidLinkTokenParameters;
+
+export default GetPlaidLinkTokenParameters;
diff --git a/src/libs/getSecureEntryKeyboardType/index.android.js b/src/libs/getSecureEntryKeyboardType/index.android.js
deleted file mode 100644
index 03ba8f571fe9..000000000000
--- a/src/libs/getSecureEntryKeyboardType/index.android.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import CONST from '../../CONST';
-
-/**
- * Return visible-password keyboard type when secure text is visible on Android,
- * otherwise return keyboardType passed as function parameter
- * @param {String} keyboardType
- * @param {Boolean} secureTextEntry
- * @param {Boolean} passwordHidden
- * @return {String}
- */
-export default (keyboardType, secureTextEntry, passwordHidden) => (secureTextEntry && !passwordHidden ? CONST.KEYBOARD_TYPE.VISIBLE_PASSWORD : keyboardType);
diff --git a/src/libs/getSecureEntryKeyboardType/index.android.ts b/src/libs/getSecureEntryKeyboardType/index.android.ts
new file mode 100644
index 000000000000..afd808f35b10
--- /dev/null
+++ b/src/libs/getSecureEntryKeyboardType/index.android.ts
@@ -0,0 +1,11 @@
+import CONST from '../../CONST';
+import GetSecureEntryKeyboardType from './types';
+
+/**
+ * Return visible-password keyboard type when secure text is visible on Android,
+ * otherwise return keyboardType passed as function parameter
+ */
+const getSecureEntryKeyboardType: GetSecureEntryKeyboardType = (keyboardType, secureTextEntry, passwordHidden) =>
+    secureTextEntry && !passwordHidden ? CONST.KEYBOARD_TYPE.VISIBLE_PASSWORD : keyboardType;
+
+export default getSecureEntryKeyboardType;
diff --git a/src/libs/getSecureEntryKeyboardType/index.js b/src/libs/getSecureEntryKeyboardType/index.js
deleted file mode 100644
index f6e2b9919b10..000000000000
--- a/src/libs/getSecureEntryKeyboardType/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Return keyboardType passed as function parameter on Web/Desktop/iOS
- * @param {String} keyboardType
- * @return {String}
- */
-export default (keyboardType) => keyboardType;
diff --git a/src/libs/getSecureEntryKeyboardType/index.ts b/src/libs/getSecureEntryKeyboardType/index.ts
new file mode 100644
index 000000000000..030a88e60e84
--- /dev/null
+++ b/src/libs/getSecureEntryKeyboardType/index.ts
@@ -0,0 +1,8 @@
+import GetSecureEntryKeyboardType from './types';
+
+/**
+ * Return keyboardType passed as function parameter on Web/Desktop/iOS
+ */
+const getSecureEntryKeyboardType: GetSecureEntryKeyboardType = (keyboardType) => keyboardType;
+
+export default getSecureEntryKeyboardType;
diff --git a/src/libs/getSecureEntryKeyboardType/types.ts b/src/libs/getSecureEntryKeyboardType/types.ts
new file mode 100644
index 000000000000..fe79440e3109
--- /dev/null
+++ b/src/libs/getSecureEntryKeyboardType/types.ts
@@ -0,0 +1,3 @@
+type GetSecureEntryKeyboardType = (keyboardType: string, secureTextEntry: boolean, passwordHidden: boolean) => string;
+
+export default GetSecureEntryKeyboardType;
diff --git a/src/libs/hashCode.js b/src/libs/hashCode.ts
similarity index 80%
rename from src/libs/hashCode.js
rename to src/libs/hashCode.ts
index a95d0787a6e3..bb0522c25de0 100644
--- a/src/libs/hashCode.js
+++ b/src/libs/hashCode.ts
@@ -2,11 +2,11 @@
 /**
  * Simple string hashing function obtained from: https://stackoverflow.com/a/8831937/16434681
  * Returns a hash code from a string
- * @param  {String} str The string to hash.
- * @return {Number} A 32bit integer (can be negative)
+ * @param str The string to hash.
+ * @return A 32bit integer (can be negative)
  * @see http://werxltd.com/wp/2010/05/13/javascript-implementation-of-javas-string-hashcode-method/
  */
-function hashCode(str) {
+function hashCode(str: string): number {
     let hash = 0;
     for (let i = 0, len = str.length; i < len; i++) {
         const chr = str.charCodeAt(i);
diff --git a/src/libs/isInputAutoFilled.js b/src/libs/isInputAutoFilled.ts
similarity index 66%
rename from src/libs/isInputAutoFilled.js
rename to src/libs/isInputAutoFilled.ts
index 8daa72484647..e1b9942b0e78 100644
--- a/src/libs/isInputAutoFilled.js
+++ b/src/libs/isInputAutoFilled.ts
@@ -2,11 +2,11 @@ import isSelectorSupported from './isSelectorSupported';
 
 /**
  * Check the input is auto filled or not
- * @param  {Object} input
- * @return {Boolean}
  */
-export default function isInputAutoFilled(input) {
-    if (!input || !input.matches) return false;
+export default function isInputAutoFilled(input: Element): boolean {
+    if (!input?.matches) {
+        return false;
+    }
     if (isSelectorSupported(':autofill')) {
         return input.matches(':-webkit-autofill') || input.matches(':autofill');
     }
diff --git a/src/libs/isReportMessageAttachment.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/migrateOnyx.js b/src/libs/migrateOnyx.js
index 9389a9b66fbc..289f8913b534 100644
--- a/src/libs/migrateOnyx.js
+++ b/src/libs/migrateOnyx.js
@@ -1,13 +1,9 @@
 import _ from 'underscore';
 import Log from './Log';
-import AddEncryptedAuthToken from './migrations/AddEncryptedAuthToken';
-import RenameActiveClientsKey from './migrations/RenameActiveClientsKey';
 import RenamePriorityModeKey from './migrations/RenamePriorityModeKey';
-import MoveToIndexedDB from './migrations/MoveToIndexedDB';
-import RenameExpensifyNewsStatus from './migrations/RenameExpensifyNewsStatus';
 import AddLastVisibleActionCreated from './migrations/AddLastVisibleActionCreated';
-import KeyReportActionsByReportActionID from './migrations/KeyReportActionsByReportActionID';
 import PersonalDetailsByAccountID from './migrations/PersonalDetailsByAccountID';
+import RenameReceiptFilename from './migrations/RenameReceiptFilename';
 
 export default function () {
     const startTime = Date.now();
@@ -15,16 +11,7 @@ export default function () {
 
     return new Promise((resolve) => {
         // Add all migrations to an array so they are executed in order
-        const migrationPromises = [
-            MoveToIndexedDB,
-            RenameActiveClientsKey,
-            RenamePriorityModeKey,
-            AddEncryptedAuthToken,
-            RenameExpensifyNewsStatus,
-            AddLastVisibleActionCreated,
-            KeyReportActionsByReportActionID,
-            PersonalDetailsByAccountID,
-        ];
+        const migrationPromises = [RenamePriorityModeKey, AddLastVisibleActionCreated, PersonalDetailsByAccountID, RenameReceiptFilename];
 
         // Reduce all promises down to a single promise. All promises run in a linear fashion, waiting for the
         // previous promise to finish before moving onto the next one.
diff --git a/src/libs/migrations/AddEncryptedAuthToken.js b/src/libs/migrations/AddEncryptedAuthToken.js
deleted file mode 100644
index 1c8d6a1e2a43..000000000000
--- a/src/libs/migrations/AddEncryptedAuthToken.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/* eslint-disable rulesdir/no-api-in-views */
-import _ from 'underscore';
-import Onyx from 'react-native-onyx';
-import Log from '../Log';
-import ONYXKEYS from '../../ONYXKEYS';
-import * as Authentication from '../Authentication';
-
-/**
- * This migration adds an encryptedAuthToken to the SESSION key, if it is not present.
- *
- * @returns {Promise}
- */
-export default function () {
-    return new Promise((resolve) => {
-        const connectionID = Onyx.connect({
-            key: ONYXKEYS.SESSION,
-            callback: (session) => {
-                Onyx.disconnect(connectionID);
-
-                if (session && !_.isEmpty(session.encryptedAuthToken)) {
-                    Log.info('[Migrate Onyx] Skipped migration AddEncryptedAuthToken');
-                    return resolve();
-                }
-
-                if (!session || !session.authToken) {
-                    Log.info('[Migrate Onyx] Skipped migration AddEncryptedAuthToken');
-                    return resolve();
-                }
-
-                // If there is an auth token but no encrypted auth token, reauthenticate.
-                if (session.authToken && _.isUndefined(session.encryptedAuthToken)) {
-                    return Authentication.reauthenticate('Onyx_Migration_AddEncryptedAuthToken').then(() => {
-                        Log.info('[Migrate Onyx] Ran migration AddEncryptedAuthToken');
-                        return resolve();
-                    });
-                }
-
-                return resolve();
-            },
-        });
-    });
-}
diff --git a/src/libs/migrations/KeyReportActionsByReportActionID.js b/src/libs/migrations/KeyReportActionsByReportActionID.js
deleted file mode 100644
index 0dc1d003feab..000000000000
--- a/src/libs/migrations/KeyReportActionsByReportActionID.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import _ from 'underscore';
-import Onyx from 'react-native-onyx';
-import Log from '../Log';
-import ONYXKEYS from '../../ONYXKEYS';
-
-/**
- * This migration updates reportActions data to be keyed by reportActionID rather than by sequenceNumber.
- *
- * @returns {Promise}
- */
-export default function () {
-    return new Promise((resolve) => {
-        const connectionID = Onyx.connect({
-            key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-            waitForCollectionCallback: true,
-            callback: (allReportActions) => {
-                Onyx.disconnect(connectionID);
-
-                if (!allReportActions) {
-                    Log.info('[Migrate Onyx] Skipped migration KeyReportActionsByReportActionID because there were no reportActions');
-                    return resolve();
-                }
-
-                const newReportActions = {};
-                const allReportActionsEntires = Object.entries(allReportActions);
-                for (let i = 0; i < allReportActionsEntires.length; i++) {
-                    const [onyxKey, reportActionsForReport] = allReportActionsEntires[i];
-                    if (reportActionsForReport) {
-                        const newReportActionsForReport = {};
-                        const reportActionsForReportEntries = Object.entries(reportActionsForReport);
-                        for (let j = 0; j < reportActionsForReportEntries.length; j++) {
-                            const [reportActionKey, reportAction] = reportActionsForReportEntries[j];
-                            if (!reportAction) {
-                                Log.info('[Migrate Onyx] Skipped migration KeyReportActionsByReportActionID because the reportAction was deleted');
-                                return resolve();
-                            }
-                            if (
-                                !_.isNaN(Number(reportActionKey)) &&
-                                Number(reportActionKey) === Number(reportAction.reportActionID) &&
-                                Number(reportActionKey) !== Number(reportAction.sequenceNumber)
-                            ) {
-                                Log.info('[Migrate Onyx] Skipped migration KeyReportActionsByReportActionID because we already migrated it');
-                                return resolve();
-                            }
-
-                            // Move it to be keyed by reportActionID instead
-                            newReportActionsForReport[reportAction.reportActionID] = reportAction;
-                        }
-                        newReportActions[onyxKey] = newReportActionsForReport;
-                    }
-                }
-
-                if (_.isEmpty(newReportActions)) {
-                    Log.info('[Migrate Onyx] Skipped migration KeyReportActionsByReportActionID because there are no actions to migrate');
-                    return resolve();
-                }
-
-                Log.info(`[Migrate Onyx] Re-keying reportActions by reportActionID for ${_.keys(newReportActions).length} reports`);
-                // eslint-disable-next-line rulesdir/prefer-actions-set-data
-                return Onyx.multiSet(newReportActions).then(resolve);
-            },
-        });
-    });
-}
diff --git a/src/libs/migrations/MoveToIndexedDB.js b/src/libs/migrations/MoveToIndexedDB.js
deleted file mode 100644
index 1f62985ed7bf..000000000000
--- a/src/libs/migrations/MoveToIndexedDB.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import _ from 'underscore';
-import Onyx from 'react-native-onyx';
-
-import Log from '../Log';
-import ONYXKEYS from '../../ONYXKEYS';
-import getPlatform from '../getPlatform';
-import CONST from '../../CONST';
-
-/**
- * Test whether the current platform is eligible for migration
- * This migration is only applicable for desktop/web
- * We're also skipping logged-out users as there would be nothing to migrate
- *
- * @returns {Boolean}
- */
-function shouldMigrate() {
-    const isTargetPlatform = _.contains([CONST.PLATFORM.WEB, CONST.PLATFORM.DESKTOP], getPlatform());
-    if (!isTargetPlatform) {
-        Log.info('[Migrate Onyx] Skipped migration MoveToIndexedDB (Not applicable to current platform)');
-        return false;
-    }
-
-    const session = window.localStorage.getItem(ONYXKEYS.SESSION);
-    if (!session || !session.includes('authToken')) {
-        Log.info('[Migrate Onyx] Skipped migration MoveToIndexedDB (Not applicable to logged out users)');
-        return false;
-    }
-
-    return true;
-}
-
-/**
- * Find Onyx data and move it from local storage to IndexedDB
- *
- * @returns {Promise<void>}
- */
-function applyMigration() {
-    const onyxKeys = new Set(_.values(ONYXKEYS));
-    const onyxCollections = _.values(ONYXKEYS.COLLECTION);
-
-    // Prepare a key-value dictionary of keys eligible for migration
-    // Targeting existing Onyx keys in local storage or any key prefixed by a collection name
-    const dataToMigrate = _.chain(window.localStorage)
-        .keys()
-        .filter((key) => onyxKeys.has(key) || _.some(onyxCollections, (collectionKey) => key.startsWith(collectionKey)))
-        .map((key) => [key, JSON.parse(window.localStorage.getItem(key))])
-        .object()
-        .value();
-
-    // Move the data in Onyx and only then delete it from local storage
-    return Onyx.multiSet(dataToMigrate).then(() => _.each(dataToMigrate, (value, key) => window.localStorage.removeItem(key)));
-}
-
-/**
- * Migrate Web/Desktop storage to IndexedDB
- *
- * @returns {Promise}
- */
-export default function () {
-    if (!shouldMigrate()) {
-        return Promise.resolve();
-    }
-
-    return new Promise((resolve, reject) => {
-        applyMigration()
-            .then(() => {
-                Log.info('[Migrate Onyx] Ran migration MoveToIndexedDB');
-                resolve();
-            })
-            .catch((e) => {
-                Log.alert('[Migrate Onyx] MoveToIndexedDB failed', {error: e.message, stack: e.stack}, false);
-                reject(e);
-            });
-    });
-}
diff --git a/src/libs/migrations/RenameActiveClientsKey.js b/src/libs/migrations/RenameActiveClientsKey.js
deleted file mode 100644
index 54b36e13cff5..000000000000
--- a/src/libs/migrations/RenameActiveClientsKey.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import Onyx from 'react-native-onyx';
-import _ from 'underscore';
-import Log from '../Log';
-import ONYXKEYS from '../../ONYXKEYS';
-
-// This migration changes the name of the Onyx key ACTIVE_CLIENTS from activeClients2 to activeClients
-export default function () {
-    return new Promise((resolve) => {
-        // Connect to the old key in Onyx to get the old value of activeClients2
-        // then set the new key activeClients to hold the old data
-        // finally remove the old key by setting the value to null
-        const connectionID = Onyx.connect({
-            key: 'activeClients2',
-            callback: (oldActiveClients) => {
-                Onyx.disconnect(connectionID);
-
-                // Fail early here because there is nothing to migrate
-                if (_.isEmpty(oldActiveClients)) {
-                    Log.info('[Migrate Onyx] Skipped migration RenameActiveClientsKey');
-                    return resolve();
-                }
-
-                Onyx.multiSet({
-                    activeClients2: null,
-                    [ONYXKEYS.ACTIVE_CLIENTS]: oldActiveClients,
-                }).then(() => {
-                    Log.info('[Migrate Onyx] Ran migration RenameActiveClientsKey');
-                    resolve();
-                });
-            },
-        });
-    });
-}
diff --git a/src/libs/migrations/RenameExpensifyNewsStatus.js b/src/libs/migrations/RenameExpensifyNewsStatus.js
deleted file mode 100644
index 421879b0e8ad..000000000000
--- a/src/libs/migrations/RenameExpensifyNewsStatus.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import Onyx from 'react-native-onyx';
-import _ from 'underscore';
-import ONYXKEYS from '../../ONYXKEYS';
-import Log from '../Log';
-
-// This migration changes the name of the Onyx key user.expensifyNewsStatus from expensifyNewsStatus to isSubscribedToNewsletter
-export default function () {
-    return new Promise((resolve) => {
-        // Connect to the USER key in Onyx to get the value of expensifyNewsStatus
-        // then set that value as isSubscribedToNewsletter
-        // finally remove expensifyNewsStatus by setting the value to null
-        const connectionID = Onyx.connect({
-            key: ONYXKEYS.USER,
-            callback: (user) => {
-                Onyx.disconnect(connectionID);
-
-                // Fail early here because there is nothing to migrate
-                if (!user || _.isNull(user.expensifyNewsStatus) || _.isUndefined(user.expensifyNewsStatus)) {
-                    Log.info('[Migrate Onyx] Skipped migration RenameExpensifyNewsStatus');
-                    return resolve();
-                }
-
-                // eslint-disable-next-line rulesdir/prefer-actions-set-data
-                Onyx.merge(ONYXKEYS.USER, {
-                    expensifyNewsStatus: null,
-                    isSubscribedToNewsletter: user.expensifyNewsStatus,
-                }).then(() => {
-                    Log.info('[Migrate Onyx] Ran migration RenameExpensifyNewsStatus');
-                    resolve();
-                });
-            },
-        });
-    });
-}
diff --git a/src/libs/migrations/RenameReceiptFilename.js b/src/libs/migrations/RenameReceiptFilename.js
new file mode 100644
index 000000000000..b8df705fd7d1
--- /dev/null
+++ b/src/libs/migrations/RenameReceiptFilename.js
@@ -0,0 +1,57 @@
+import Onyx from 'react-native-onyx';
+import _ from 'underscore';
+import lodashHas from 'lodash/has';
+import ONYXKEYS from '../../ONYXKEYS';
+import Log from '../Log';
+
+// This migration changes the property name on a transaction from receiptFilename to filename so that it matches what is stored in the database
+export default function () {
+    return new Promise((resolve) => {
+        // Connect to the TRANSACTION collection key in Onyx to get all of the stored transactions.
+        // Go through each transaction and change the property name
+        const connectionID = Onyx.connect({
+            key: ONYXKEYS.COLLECTION.TRANSACTION,
+            waitForCollectionCallback: true,
+            callback: (transactions) => {
+                Onyx.disconnect(connectionID);
+
+                if (!transactions || transactions.length === 0) {
+                    Log.info('[Migrate Onyx] Skipped migration RenameReceiptFilename because there are no transactions');
+                    return resolve();
+                }
+
+                if (!_.compact(_.pluck(transactions, 'receiptFilename')).length) {
+                    Log.info('[Migrate Onyx] Skipped migration RenameReceiptFilename because there were no transactions with the receiptFilename property');
+                    return resolve();
+                }
+
+                Log.info('[Migrate Onyx] Running  RenameReceiptFilename migration');
+
+                const dataToSave = _.reduce(
+                    transactions,
+                    (result, transaction) => {
+                        // Do nothing if there is no receiptFilename property
+                        if (!lodashHas(transaction, 'receiptFilename')) {
+                            return result;
+                        }
+                        Log.info(`[Migrate Onyx] Renaming receiptFilename ${transaction.receiptFilename} to filename`);
+                        return {
+                            ...result,
+                            [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`]: {
+                                filename: transaction.receiptFilename,
+                                receiptFilename: null,
+                            },
+                        };
+                    },
+                    {},
+                );
+
+                // eslint-disable-next-line rulesdir/prefer-actions-set-data
+                Onyx.mergeCollection(ONYXKEYS.COLLECTION.TRANSACTION, dataToSave).then(() => {
+                    Log.info(`[Migrate Onyx] Ran migration RenameReceiptFilename and renamed ${_.size(dataToSave)} properties`);
+                    resolve();
+                });
+            },
+        });
+    });
+}
diff --git a/src/libs/openReportActionComposeViewWhenClosingMessageEdit/index.js b/src/libs/openReportActionComposeViewWhenClosingMessageEdit/index.js
deleted file mode 100644
index 4f3e8c5de2c8..000000000000
--- a/src/libs/openReportActionComposeViewWhenClosingMessageEdit/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import * as Composer from '../actions/Composer';
-
-export default () => {
-    Composer.setShouldShowComposeInput(true);
-};
diff --git a/src/libs/openReportActionComposeViewWhenClosingMessageEdit/index.native.js b/src/libs/openReportActionComposeViewWhenClosingMessageEdit/index.native.js
deleted file mode 100644
index 488769741715..000000000000
--- a/src/libs/openReportActionComposeViewWhenClosingMessageEdit/index.native.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import {Keyboard} from 'react-native';
-import * as Composer from '../actions/Composer';
-
-export default () => {
-    const keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', () => {
-        Composer.setShouldShowComposeInput(true);
-        keyboardDidHideListener.remove();
-    });
-};
diff --git a/src/libs/requireParameters.ts b/src/libs/requireParameters.ts
index 098a6d114430..ebeb55e254e0 100644
--- a/src/libs/requireParameters.ts
+++ b/src/libs/requireParameters.ts
@@ -14,7 +14,9 @@ export default function requireParameters(parameterNames: string[], parameters:
         const propertiesToRedact = ['authToken', 'password', 'partnerUserSecret', 'twoFactorAuthCode'];
         const parametersCopy = {...parameters};
         Object.keys(parametersCopy).forEach((key) => {
-            if (!propertiesToRedact.includes(key.toString())) return;
+            if (!propertiesToRedact.includes(key.toString())) {
+                return;
+            }
 
             parametersCopy[key] = '<redacted>';
         });
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/setShouldShowComposeInputKeyboardAware/index.js b/src/libs/setShouldShowComposeInputKeyboardAware/index.js
new file mode 100644
index 000000000000..a8ad5f54a65f
--- /dev/null
+++ b/src/libs/setShouldShowComposeInputKeyboardAware/index.js
@@ -0,0 +1,5 @@
+import * as Composer from '../actions/Composer';
+
+export default (shouldShow) => {
+    Composer.setShouldShowComposeInput(shouldShow);
+};
diff --git a/src/libs/setShouldShowComposeInputKeyboardAware/index.native.js b/src/libs/setShouldShowComposeInputKeyboardAware/index.native.js
new file mode 100644
index 000000000000..147d21d51168
--- /dev/null
+++ b/src/libs/setShouldShowComposeInputKeyboardAware/index.native.js
@@ -0,0 +1,26 @@
+import {Keyboard} from 'react-native';
+import * as Composer from '../actions/Composer';
+
+let keyboardDidHideListener = null;
+export default (shouldShow) => {
+    if (keyboardDidHideListener) {
+        keyboardDidHideListener.remove();
+        keyboardDidHideListener = null;
+    }
+
+    if (!shouldShow) {
+        Composer.setShouldShowComposeInput(false);
+        return;
+    }
+
+    // If keyboard is already hidden, we should show composer immediately because keyboardDidHide event won't be called
+    if (!Keyboard.isVisible()) {
+        Composer.setShouldShowComposeInput(true);
+        return;
+    }
+
+    keyboardDidHideListener = Keyboard.addListener('keyboardDidHide', () => {
+        Composer.setShouldShowComposeInput(true);
+        keyboardDidHideListener.remove();
+    });
+};
diff --git a/src/libs/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/AddPersonalBankAccountPage.js b/src/pages/AddPersonalBankAccountPage.js
index 8ef8b71b90d0..7c04970c3980 100644
--- a/src/pages/AddPersonalBankAccountPage.js
+++ b/src/pages/AddPersonalBankAccountPage.js
@@ -103,6 +103,7 @@ class AddPersonalBankAccountPage extends React.Component {
                 includeSafeAreaPaddingBottom={shouldShowSuccess}
                 shouldEnablePickerAvoiding={false}
                 shouldShowOfflineIndicator={false}
+                testID={AddPersonalBankAccountPage.displayName}
             >
                 <HeaderWithBackButton
                     title={this.props.translate('bankAccount.addBankAccount')}
@@ -132,7 +133,7 @@ class AddPersonalBankAccountPage extends React.Component {
                                     this.setState({selectedPlaidAccountID});
                                 }}
                                 plaidData={this.props.plaidData}
-                                onExitPlaid={Navigation.goBack}
+                                onExitPlaid={() => Navigation.goBack(ROUTES.HOME)}
                                 receivedRedirectURI={getPlaidOAuthReceivedRedirectURI()}
                                 selectedPlaidAccountID={this.state.selectedPlaidAccountID}
                             />
diff --git a/src/pages/ConciergePage.js b/src/pages/ConciergePage.js
index 610fa3587b7a..e8509024b469 100644
--- a/src/pages/ConciergePage.js
+++ b/src/pages/ConciergePage.js
@@ -7,6 +7,7 @@ import ONYXKEYS from '../ONYXKEYS';
 import FullScreenLoadingIndicator from '../components/FullscreenLoadingIndicator';
 import Navigation from '../libs/Navigation/Navigation';
 import * as Report from '../libs/actions/Report';
+import ROUTES from '../ROUTES';
 
 const propTypes = {
     /** Session info for the currently logged in user. */
@@ -31,7 +32,7 @@ function ConciergePage(props) {
     useFocusEffect(() => {
         if (_.has(props.session, 'authToken')) {
             // Pop the concierge loading page before opening the concierge report.
-            Navigation.goBack();
+            Navigation.goBack(ROUTES.HOME);
             Report.navigateToConciergeChat();
         } else {
             Navigation.navigate();
diff --git a/src/pages/DemoSetupPage.js b/src/pages/DemoSetupPage.js
index 0f7578760c16..5d4b99a0daf9 100644
--- a/src/pages/DemoSetupPage.js
+++ b/src/pages/DemoSetupPage.js
@@ -2,9 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {useFocusEffect} from '@react-navigation/native';
 import FullScreenLoadingIndicator from '../components/FullscreenLoadingIndicator';
-import CONST from '../CONST';
-import * as DemoActions from '../libs/actions/DemoActions';
 import Navigation from '../libs/Navigation/Navigation';
+import ROUTES from '../ROUTES';
 
 const propTypes = {
     /** Navigation route context info provided by react navigation */
@@ -15,22 +14,14 @@ const propTypes = {
 };
 
 /*
- * This is a "utility page", that does this:
- *     - Looks at the current route
- *     - Determines if there's a demo command we need to call
- *     - If not, routes back to home
+ * This is a "utility page", that used to call specific actions depending on the
+ * route that led the user here. Now, it's just used to route the user home so we
+ * don't show them a "Hmm... It's not here" message (which looks broken).
  */
-function DemoSetupPage(props) {
+function DemoSetupPage() {
     useFocusEffect(() => {
         Navigation.isNavigationReady().then(() => {
-            // Depending on the route that the user hit to get here, run a specific demo flow
-            if (props.route.name === CONST.DEMO_PAGES.SAASTR) {
-                DemoActions.runSaastrDemo();
-            } else if (props.route.name === CONST.DEMO_PAGES.SBE) {
-                DemoActions.runSbeDemo();
-            } else {
-                Navigation.goBack();
-            }
+            Navigation.goBack(ROUTES.HOME);
         });
     });
 
diff --git a/src/pages/DetailsPage.js b/src/pages/DetailsPage.js
index 7873c4daa00c..2f8d42c686a9 100755
--- a/src/pages/DetailsPage.js
+++ b/src/pages/DetailsPage.js
@@ -27,8 +27,6 @@ import * as Report from '../libs/actions/Report';
 import OfflineWithFeedback from '../components/OfflineWithFeedback';
 import AutoUpdateTime from '../components/AutoUpdateTime';
 import FullPageNotFoundView from '../components/BlockingViews/FullPageNotFoundView';
-import Navigation from '../libs/Navigation/Navigation';
-import ROUTES from '../ROUTES';
 import * as UserUtils from '../libs/UserUtils';
 
 const matchType = PropTypes.shape({
@@ -128,12 +126,9 @@ function DetailsPage(props) {
     const isCurrentUser = _.keys(props.loginList).includes(details.login);
 
     return (
-        <ScreenWrapper>
+        <ScreenWrapper testID={DetailsPage.displayName}>
             <FullPageNotFoundView shouldShow={_.isEmpty(login)}>
-                <HeaderWithBackButton
-                    title={props.translate('common.details')}
-                    onBackButtonPress={() => Navigation.goBack(ROUTES.HOME)}
-                />
+                <HeaderWithBackButton title={props.translate('common.details')} />
                 <View
                     pointerEvents="box-none"
                     style={[styles.containerWithSpaceBetween]}
@@ -160,6 +155,7 @@ function DetailsPage(props) {
                                                     imageStyles={[styles.avatarLarge]}
                                                     source={UserUtils.getAvatar(details.avatar, details.accountID)}
                                                     size={CONST.AVATAR_SIZE.LARGE}
+                                                    fallbackIcon={details.fallbackIcon}
                                                 />
                                             </OfflineWithFeedback>
                                         </PressableWithoutFocus>
diff --git a/src/pages/EditRequestAmountPage.js b/src/pages/EditRequestAmountPage.js
index d087d86ebdf5..9f72c9afbc23 100644
--- a/src/pages/EditRequestAmountPage.js
+++ b/src/pages/EditRequestAmountPage.js
@@ -43,7 +43,7 @@ function EditRequestAmountPage({defaultAmount, defaultCurrency, onSubmit, report
     const navigateToCurrencySelectionPage = () => {
         // Remove query from the route and encode it.
         const activeRoute = encodeURIComponent(Navigation.getActiveRoute().replace(/\?.*/, ''));
-        Navigation.navigate(ROUTES.getEditRequestCurrencyRoute(reportID, defaultCurrency, activeRoute));
+        Navigation.navigate(ROUTES.EDIT_CURRENCY_REQUEST.getRoute(reportID, defaultCurrency, activeRoute));
     };
 
     useFocusEffect(
@@ -56,11 +56,9 @@ function EditRequestAmountPage({defaultAmount, defaultCurrency, onSubmit, report
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
+            testID={EditRequestAmountPage.displayName}
         >
-            <HeaderWithBackButton
-                title={translate('iou.amount')}
-                onBackButtonPress={Navigation.goBack}
-            />
+            <HeaderWithBackButton title={translate('iou.amount')} />
             <MoneyRequestAmountForm
                 isEditing
                 currency={defaultCurrency}
diff --git a/src/pages/EditRequestCategoryPage.js b/src/pages/EditRequestCategoryPage.js
new file mode 100644
index 000000000000..e47935dd9df1
--- /dev/null
+++ b/src/pages/EditRequestCategoryPage.js
@@ -0,0 +1,52 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ScreenWrapper from '../components/ScreenWrapper';
+import HeaderWithBackButton from '../components/HeaderWithBackButton';
+import Navigation from '../libs/Navigation/Navigation';
+import useLocalize from '../hooks/useLocalize';
+import CategoryPicker from '../components/CategoryPicker';
+
+const propTypes = {
+    /** Transaction default category value */
+    defaultCategory: PropTypes.string.isRequired,
+
+    /** The policyID we are getting categories for */
+    policyID: PropTypes.string.isRequired,
+
+    /** Callback to fire when the Save button is pressed  */
+    onSubmit: PropTypes.func.isRequired,
+};
+
+function EditRequestCategoryPage({defaultCategory, policyID, onSubmit}) {
+    const {translate} = useLocalize();
+
+    const selectCategory = (category) => {
+        onSubmit({
+            category: category.searchText,
+        });
+    };
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+            testID={EditRequestCategoryPage.displayName}
+        >
+            <HeaderWithBackButton
+                title={translate('common.category')}
+                onBackButtonPress={Navigation.goBack}
+            />
+
+            <CategoryPicker
+                selectedCategory={defaultCategory}
+                policyID={policyID}
+                onSubmit={selectCategory}
+            />
+        </ScreenWrapper>
+    );
+}
+
+EditRequestCategoryPage.propTypes = propTypes;
+EditRequestCategoryPage.displayName = 'EditRequestCategoryPage';
+
+export default EditRequestCategoryPage;
diff --git a/src/pages/EditRequestCreatedPage.js b/src/pages/EditRequestCreatedPage.js
index 79633c214486..9edce7350400 100644
--- a/src/pages/EditRequestCreatedPage.js
+++ b/src/pages/EditRequestCreatedPage.js
@@ -5,7 +5,6 @@ import HeaderWithBackButton from '../components/HeaderWithBackButton';
 import Form from '../components/Form';
 import ONYXKEYS from '../ONYXKEYS';
 import styles from '../styles/styles';
-import Navigation from '../libs/Navigation/Navigation';
 import useLocalize from '../hooks/useLocalize';
 import NewDatePicker from '../components/NewDatePicker';
 
@@ -24,11 +23,9 @@ function EditRequestCreatedPage({defaultCreated, onSubmit}) {
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
+            testID={EditRequestCreatedPage.displayName}
         >
-            <HeaderWithBackButton
-                title={translate('common.date')}
-                onBackButtonPress={Navigation.goBack}
-            />
+            <HeaderWithBackButton title={translate('common.date')} />
             <Form
                 style={[styles.flexGrow1, styles.ph5]}
                 formID={ONYXKEYS.FORMS.MONEY_REQUEST_DATE_FORM}
diff --git a/src/pages/EditRequestDescriptionPage.js b/src/pages/EditRequestDescriptionPage.js
index 1db81c88daae..0c0fcad7f60b 100644
--- a/src/pages/EditRequestDescriptionPage.js
+++ b/src/pages/EditRequestDescriptionPage.js
@@ -1,15 +1,17 @@
-import React, {useRef} from 'react';
+import React, {useRef, useCallback} from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
+import {useFocusEffect} from '@react-navigation/native';
 import TextInput from '../components/TextInput';
 import ScreenWrapper from '../components/ScreenWrapper';
 import HeaderWithBackButton from '../components/HeaderWithBackButton';
 import Form from '../components/Form';
 import ONYXKEYS from '../ONYXKEYS';
 import styles from '../styles/styles';
-import Navigation from '../libs/Navigation/Navigation';
 import CONST from '../CONST';
 import useLocalize from '../hooks/useLocalize';
+import * as Browser from '../libs/Browser';
+import updateMultilineInputRange from '../libs/UpdateMultilineInputRange';
 
 const propTypes = {
     /** Transaction default description value */
@@ -22,16 +24,31 @@ const propTypes = {
 function EditRequestDescriptionPage({defaultDescription, onSubmit}) {
     const {translate} = useLocalize();
     const descriptionInputRef = useRef(null);
+    const focusTimeoutRef = useRef(null);
+
+    useFocusEffect(
+        useCallback(() => {
+            focusTimeoutRef.current = setTimeout(() => {
+                if (descriptionInputRef.current) {
+                    descriptionInputRef.current.focus();
+                }
+                return () => {
+                    if (!focusTimeoutRef.current) {
+                        return;
+                    }
+                    clearTimeout(focusTimeoutRef.current);
+                };
+            }, CONST.ANIMATED_TRANSITION);
+        }, []),
+    );
+
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
-            onEntryTransitionEnd={() => descriptionInputRef.current && descriptionInputRef.current.focus()}
+            testID={EditRequestDescriptionPage.displayName}
         >
-            <HeaderWithBackButton
-                title={translate('common.description')}
-                onBackButtonPress={() => Navigation.goBack()}
-            />
+            <HeaderWithBackButton title={translate('common.description')} />
             <Form
                 style={[styles.flexGrow1, styles.ph5]}
                 formID={ONYXKEYS.FORMS.MONEY_REQUEST_DESCRIPTION_FORM}
@@ -48,7 +65,17 @@ function EditRequestDescriptionPage({defaultDescription, onSubmit}) {
                         label={translate('moneyRequestConfirmationList.whatsItFor')}
                         accessibilityLabel={translate('moneyRequestConfirmationList.whatsItFor')}
                         accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                        ref={(e) => (descriptionInputRef.current = e)}
+                        ref={(el) => {
+                            if (!el) {
+                                return;
+                            }
+                            descriptionInputRef.current = el;
+                            updateMultilineInputRange(descriptionInputRef.current);
+                        }}
+                        autoGrowHeight
+                        containerStyles={[styles.autoGrowHeightMultilineInput]}
+                        textAlignVertical="top"
+                        submitOnEnter={!Browser.isMobile()}
                     />
                 </View>
             </Form>
diff --git a/src/pages/EditRequestDistancePage.js b/src/pages/EditRequestDistancePage.js
new file mode 100644
index 000000000000..84aa4de1acb0
--- /dev/null
+++ b/src/pages/EditRequestDistancePage.js
@@ -0,0 +1,127 @@
+import React, {useEffect, useRef} from 'react';
+import lodashGet from 'lodash/get';
+import PropTypes from 'prop-types';
+import _ from 'underscore';
+import {withOnyx} from 'react-native-onyx';
+import ONYXKEYS from '../ONYXKEYS';
+import CONST from '../CONST';
+import ScreenWrapper from '../components/ScreenWrapper';
+import HeaderWithBackButton from '../components/HeaderWithBackButton';
+import Navigation from '../libs/Navigation/Navigation';
+import useLocalize from '../hooks/useLocalize';
+import DistanceRequest from '../components/DistanceRequest';
+import reportPropTypes from './reportPropTypes';
+import * as IOU from '../libs/actions/IOU';
+import transactionPropTypes from '../components/transactionPropTypes';
+import * as TransactionEdit from '../libs/actions/TransactionEdit';
+import useNetwork from '../hooks/useNetwork';
+import usePrevious from '../hooks/usePrevious';
+
+const propTypes = {
+    /** The transactionID we're currently editing */
+    transactionID: PropTypes.string.isRequired,
+
+    /** The report to with which the distance request is associated */
+    report: reportPropTypes.isRequired,
+
+    /** Passed from the navigator */
+    route: PropTypes.shape({
+        /** Parameters the route gets */
+        params: PropTypes.shape({
+            /** Type of IOU */
+            iouType: PropTypes.oneOf(_.values(CONST.IOU.MONEY_REQUEST_TYPE)),
+
+            /** Id of the report on which the distance request is being created */
+            reportID: PropTypes.string,
+        }),
+    }).isRequired,
+
+    /* Onyx props */
+    /** The original transaction that is being edited */
+    transaction: transactionPropTypes,
+};
+
+const defaultProps = {
+    transaction: {},
+};
+
+function EditRequestDistancePage({report, route, transaction}) {
+    const {isOffline} = useNetwork();
+    const {translate} = useLocalize();
+    const transactionWasSaved = useRef(false);
+    const hasWaypointError = useRef(false);
+    const prevIsLoading = usePrevious(transaction.isLoading);
+
+    useEffect(() => {
+        hasWaypointError.current = Boolean(lodashGet(transaction, 'errorFields.route') || lodashGet(transaction, 'errorFields.waypoints'));
+
+        // When the loading goes from true to false, then we know the transaction has just been
+        // saved to the server. Check for errors. If there are no errors, then the modal can be closed.
+        if (prevIsLoading && !transaction.isLoading && !hasWaypointError.current) {
+            Navigation.dismissModal(report.reportID);
+        }
+    }, [transaction, prevIsLoading, report]);
+
+    useEffect(() => {
+        // This effect runs when the component is mounted and unmounted. It's purpose is to be able to properly
+        // discard changes if the user cancels out of making any changes. This is accomplished by backing up the
+        // original transaction, letting the user modify the current transaction, and then if the user ever
+        // cancels out of the modal without saving changes, the original transaction is restored from the backup.
+
+        // On mount, create the backup transaction.
+        TransactionEdit.createBackupTransaction(transaction);
+
+        return () => {
+            // If the user cancels out of the modal without without saving changes, then the original transaction
+            // needs to be restored from the backup so that all changes are removed.
+            if (transactionWasSaved.current) {
+                return;
+            }
+            TransactionEdit.restoreOriginalTransactionFromBackup(transaction.transactionID);
+        };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
+    /**
+     * Save the changes to the original transaction object
+     * @param {Object} waypoints
+     */
+    const saveTransaction = (waypoints) => {
+        transactionWasSaved.current = true;
+        IOU.updateDistanceRequest(transaction.transactionID, report.reportID, {waypoints});
+
+        // If the client is offline, then the modal can be closed as well (because there are no errors or other feedback to show them
+        // until they come online again and sync with the server).
+        if (isOffline) {
+            Navigation.dismissModal(report.reportID);
+        }
+    };
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('common.distance')}
+                onBackButtonPress={() => Navigation.goBack()}
+            />
+            <DistanceRequest
+                report={report}
+                route={route}
+                transactionID={transaction.transactionID}
+                onSubmit={saveTransaction}
+                isEditingRequest
+            />
+        </ScreenWrapper>
+    );
+}
+
+EditRequestDistancePage.propTypes = propTypes;
+EditRequestDistancePage.defaultProps = defaultProps;
+EditRequestDistancePage.displayName = 'EditRequestDistancePage';
+export default withOnyx({
+    transaction: {
+        key: (props) => `${ONYXKEYS.COLLECTION.TRANSACTION}${props.transactionID}`,
+    },
+})(EditRequestDistancePage);
diff --git a/src/pages/EditRequestMerchantPage.js b/src/pages/EditRequestMerchantPage.js
index bb37383cfbfe..7e15a88a3ab4 100644
--- a/src/pages/EditRequestMerchantPage.js
+++ b/src/pages/EditRequestMerchantPage.js
@@ -8,7 +8,6 @@ import HeaderWithBackButton from '../components/HeaderWithBackButton';
 import Form from '../components/Form';
 import ONYXKEYS from '../ONYXKEYS';
 import styles from '../styles/styles';
-import Navigation from '../libs/Navigation/Navigation';
 import CONST from '../CONST';
 import useLocalize from '../hooks/useLocalize';
 
@@ -39,11 +38,9 @@ function EditRequestMerchantPage({defaultMerchant, onSubmit}) {
             includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
             onEntryTransitionEnd={() => merchantInputRef.current && merchantInputRef.current.focus()}
+            testID={EditRequestMerchantPage.displayName}
         >
-            <HeaderWithBackButton
-                title={translate('common.merchant')}
-                onBackButtonPress={Navigation.goBack}
-            />
+            <HeaderWithBackButton title={translate('common.merchant')} />
             <Form
                 style={[styles.flexGrow1, styles.ph5]}
                 formID={ONYXKEYS.FORMS.MONEY_REQUEST_MERCHANT_FORM}
diff --git a/src/pages/EditRequestPage.js b/src/pages/EditRequestPage.js
index 83b0019315e4..90a32ec453f5 100644
--- a/src/pages/EditRequestPage.js
+++ b/src/pages/EditRequestPage.js
@@ -2,22 +2,29 @@ import React, {useEffect} from 'react';
 import PropTypes from 'prop-types';
 import lodashGet from 'lodash/get';
 import {withOnyx} from 'react-native-onyx';
-import compose from '../libs/compose';
 import CONST from '../CONST';
-import Navigation from '../libs/Navigation/Navigation';
 import ONYXKEYS from '../ONYXKEYS';
+import compose from '../libs/compose';
+import Navigation from '../libs/Navigation/Navigation';
 import * as ReportActionsUtils from '../libs/ReportActionsUtils';
 import * as ReportUtils from '../libs/ReportUtils';
+import * as PolicyUtils from '../libs/PolicyUtils';
 import * as TransactionUtils from '../libs/TransactionUtils';
 import * as Policy from '../libs/actions/Policy';
+import * as IOU from '../libs/actions/IOU';
+import * as CurrencyUtils from '../libs/CurrencyUtils';
 import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes} from '../components/withCurrentUserPersonalDetails';
+import tagPropTypes from '../components/tagPropTypes';
+import FullPageNotFoundView from '../components/BlockingViews/FullPageNotFoundView';
 import EditRequestDescriptionPage from './EditRequestDescriptionPage';
 import EditRequestMerchantPage from './EditRequestMerchantPage';
 import EditRequestCreatedPage from './EditRequestCreatedPage';
 import EditRequestAmountPage from './EditRequestAmountPage';
+import EditRequestReceiptPage from './EditRequestReceiptPage';
 import reportPropTypes from './reportPropTypes';
-import * as IOU from '../libs/actions/IOU';
-import * as CurrencyUtils from '../libs/CurrencyUtils';
+import EditRequestDistancePage from './EditRequestDistancePage';
+import EditRequestCategoryPage from './EditRequestCategoryPage';
+import EditRequestTagPage from './EditRequestTagPage';
 
 const propTypes = {
     /** Route from navigation */
@@ -32,6 +39,7 @@ const propTypes = {
         }),
     }).isRequired,
 
+    /** Onyx props */
     /** The report object for the thread report */
     report: reportPropTypes,
 
@@ -53,6 +61,9 @@ const propTypes = {
         email: PropTypes.string,
     }),
 
+    /** Collection of tags attached to a policy */
+    policyTags: tagPropTypes,
+
     ...withCurrentUserPersonalDetailsPropTypes,
 };
 
@@ -63,12 +74,20 @@ const defaultProps = {
     session: {
         email: null,
     },
+    policyTags: {},
 };
 
-function EditRequestPage({report, route, parentReport, policy, session}) {
+function EditRequestPage({report, route, parentReport, policy, session, policyTags}) {
     const parentReportAction = ReportActionsUtils.getParentReportAction(report);
     const transaction = TransactionUtils.getLinkedTransaction(parentReportAction);
-    const {amount: transactionAmount, currency: transactionCurrency, comment: transactionDescription, merchant: transactionMerchant} = ReportUtils.getTransactionDetails(transaction);
+    const {
+        amount: transactionAmount,
+        currency: transactionCurrency,
+        comment: transactionDescription,
+        merchant: transactionMerchant,
+        category: transactionCategory,
+        tag: transactionTag,
+    } = ReportUtils.getTransactionDetails(transaction);
 
     const defaultCurrency = lodashGet(route, 'params.currency', '') || transactionCurrency;
 
@@ -83,18 +102,27 @@ function EditRequestPage({report, route, parentReport, policy, session}) {
     const isRequestor = ReportUtils.isMoneyRequestReport(parentReport) && lodashGet(session, 'accountID', null) === parentReportAction.actorAccountID;
     const canEdit = !isSettled && !isDeleted && (isAdmin || isRequestor);
 
+    // For now, it always defaults to the first tag of the policy
+    const tagListName = PolicyUtils.getTagListName(policyTags);
+
     // Dismiss the modal when the request is paid or deleted
     useEffect(() => {
         if (canEdit) {
             return;
         }
-        Navigation.dismissModal();
+        Navigation.isNavigationReady().then(() => {
+            Navigation.dismissModal();
+        });
     }, [canEdit]);
 
     // Update the transaction object and close the modal
     function editMoneyRequest(transactionChanges) {
-        IOU.editMoneyRequest(transaction.transactionID, report.reportID, transactionChanges);
-        Navigation.dismissModal();
+        if (TransactionUtils.isDistanceRequest(transaction)) {
+            IOU.updateDistanceRequest(transaction.transactionID, report.reportID, transactionChanges);
+        } else {
+            IOU.editMoneyRequest(transaction.transactionID, report.reportID, transactionChanges);
+        }
+        Navigation.dismissModal(report.reportID);
     }
 
     if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.DESCRIPTION) {
@@ -168,7 +196,62 @@ function EditRequestPage({report, route, parentReport, policy, session}) {
         );
     }
 
-    return null;
+    if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.CATEGORY) {
+        return (
+            <EditRequestCategoryPage
+                defaultCategory={transactionCategory}
+                policyID={lodashGet(report, 'policyID', '')}
+                onSubmit={(transactionChanges) => {
+                    let updatedCategory = transactionChanges.category;
+                    // In case the same category has been selected, do reset of the category.
+                    if (transactionCategory === updatedCategory) {
+                        updatedCategory = '';
+                    }
+                    editMoneyRequest({category: updatedCategory});
+                }}
+            />
+        );
+    }
+
+    if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.TAG) {
+        return (
+            <EditRequestTagPage
+                defaultTag={transactionTag}
+                tagName={tagListName}
+                policyID={lodashGet(report, 'policyID', '')}
+                onSubmit={(transactionChanges) => {
+                    let updatedTag = transactionChanges.tag;
+
+                    // In case the same tag has been selected, reset the tag.
+                    if (transactionTag === updatedTag) {
+                        updatedTag = '';
+                    }
+                    editMoneyRequest({tag: updatedTag, tagListName});
+                }}
+            />
+        );
+    }
+
+    if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.RECEIPT) {
+        return (
+            <EditRequestReceiptPage
+                route={route}
+                transactionID={transaction.transactionID}
+            />
+        );
+    }
+
+    if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.DISTANCE) {
+        return (
+            <EditRequestDistancePage
+                report={report}
+                transactionID={transaction.transactionID}
+                route={route}
+            />
+        );
+    }
+
+    return <FullPageNotFoundView shouldShow />;
 }
 
 EditRequestPage.displayName = 'EditRequestPage';
@@ -181,6 +264,7 @@ export default compose(
             key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`,
         },
     }),
+    // eslint-disable-next-line rulesdir/no-multiple-onyx-in-file
     withOnyx({
         parentReport: {
             key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report ? report.parentReportID : '0'}`,
@@ -188,5 +272,8 @@ export default compose(
         policy: {
             key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`,
         },
+        policyTags: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '0'}`,
+        },
     }),
 )(EditRequestPage);
diff --git a/src/pages/EditRequestReceiptPage.js b/src/pages/EditRequestReceiptPage.js
new file mode 100644
index 000000000000..c5dd69624159
--- /dev/null
+++ b/src/pages/EditRequestReceiptPage.js
@@ -0,0 +1,59 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ScreenWrapper from '../components/ScreenWrapper';
+import HeaderWithBackButton from '../components/HeaderWithBackButton';
+import Navigation from '../libs/Navigation/Navigation';
+import useLocalize from '../hooks/useLocalize';
+import ReceiptSelector from './iou/ReceiptSelector';
+import DragAndDropProvider from '../components/DragAndDrop/Provider';
+
+const propTypes = {
+    /** 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,
+
+    /** The id of the transaction we're editing */
+    transactionID: PropTypes.string,
+};
+
+const defaultProps = {
+    transactionID: '',
+};
+
+function EditRequestReceiptPage({route, transactionID}) {
+    const {translate} = useLocalize();
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+            testID={EditRequestReceiptPage.displayName}
+        >
+            <DragAndDropProvider>
+                <HeaderWithBackButton
+                    title={translate('common.receipt')}
+                    onBackButtonPress={Navigation.goBack}
+                />
+                <ReceiptSelector
+                    route={route}
+                    transactionID={transactionID}
+                    isInTabNavigator={false}
+                />
+            </DragAndDropProvider>
+        </ScreenWrapper>
+    );
+}
+
+EditRequestReceiptPage.propTypes = propTypes;
+EditRequestReceiptPage.defaultProps = defaultProps;
+EditRequestReceiptPage.displayName = 'EditRequestReceiptPage';
+
+export default EditRequestReceiptPage;
diff --git a/src/pages/EditRequestTagPage.js b/src/pages/EditRequestTagPage.js
new file mode 100644
index 000000000000..72ed072eec16
--- /dev/null
+++ b/src/pages/EditRequestTagPage.js
@@ -0,0 +1,53 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+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';
+
+const propTypes = {
+    /** Transaction default tag value */
+    defaultTag: PropTypes.string.isRequired,
+
+    /** The policyID we are getting tags for */
+    policyID: PropTypes.string.isRequired,
+
+    /** The tag name to which the default tag belongs to */
+    tagName: PropTypes.string.isRequired,
+
+    /** Callback to fire when the Save button is pressed  */
+    onSubmit: PropTypes.func.isRequired,
+};
+
+function EditRequestTagPage({defaultTag, policyID, tagName, onSubmit}) {
+    const {translate} = useLocalize();
+
+    const selectTag = (tag) => {
+        onSubmit({tag: tag.searchText});
+    };
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={tagName || translate('common.tag')}
+                onBackButtonPress={Navigation.goBack}
+            />
+
+            <TagPicker
+                selectedTag={defaultTag}
+                tag={tagName}
+                policyID={policyID}
+                onSubmit={selectTag}
+            />
+        </ScreenWrapper>
+    );
+}
+
+EditRequestTagPage.propTypes = propTypes;
+EditRequestTagPage.displayName = 'EditRequestTagPage';
+
+export default EditRequestTagPage;
diff --git a/src/pages/EnablePayments/AdditionalDetailsStep.js b/src/pages/EnablePayments/AdditionalDetailsStep.js
index 9804edd63fcd..cf18fc6d7303 100644
--- a/src/pages/EnablePayments/AdditionalDetailsStep.js
+++ b/src/pages/EnablePayments/AdditionalDetailsStep.js
@@ -149,6 +149,7 @@ function AdditionalDetailsStep({walletAdditionalDetails, translate, currentUserP
             <ScreenWrapper
                 style={[styles.flex1]}
                 keyboardAvoidingViewBehavior="height"
+                testID={AdditionalDetailsStep.displayName}
             >
                 <HeaderWithBackButton
                     title={translate('additionalDetailsStep.headerTitle')}
diff --git a/src/pages/EnablePayments/EnablePaymentsPage.js b/src/pages/EnablePayments/EnablePaymentsPage.js
index d62099167ced..f7ef2a174208 100644
--- a/src/pages/EnablePayments/EnablePaymentsPage.js
+++ b/src/pages/EnablePayments/EnablePaymentsPage.js
@@ -1,5 +1,5 @@
 import _ from 'underscore';
-import React from 'react';
+import React, {useEffect} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import ScreenWrapper from '../../components/ScreenWrapper';
 import * as Wallet from '../../libs/actions/Wallet';
@@ -7,8 +7,6 @@ import ONYXKEYS from '../../ONYXKEYS';
 import FullScreenLoadingIndicator from '../../components/FullscreenLoadingIndicator';
 import CONST from '../../CONST';
 import userWalletPropTypes from './userWalletPropTypes';
-import {withNetwork} from '../../components/OnyxProvider';
-import networkPropTypes from '../../components/networkPropTypes';
 
 // Steps
 import OnfidoStep from './OnfidoStep';
@@ -17,91 +15,88 @@ import TermsStep from './TermsStep';
 import ActivateStep from './ActivateStep';
 import HeaderWithBackButton from '../../components/HeaderWithBackButton';
 import FailedKYC from './FailedKYC';
-import compose from '../../libs/compose';
-import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
 import Navigation from '../../libs/Navigation/Navigation';
 import ROUTES from '../../ROUTES';
+import useLocalize from '../../hooks/useLocalize';
+import useNetwork from '../../hooks/useNetwork';
 
 const propTypes = {
-    /** Information about the network from Onyx */
-    network: networkPropTypes.isRequired,
-
     /** The user's wallet */
     userWallet: userWalletPropTypes,
-
-    ...withLocalizePropTypes,
 };
 
 const defaultProps = {
     userWallet: {},
 };
 
-class EnablePaymentsPage extends React.Component {
-    componentDidMount() {
-        Wallet.openEnablePaymentsPage();
-    }
+function EnablePaymentsPage({userWallet}) {
+    const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
 
-    componentDidUpdate(prevProps) {
-        if (!prevProps.network.isOffline || this.props.network.isOffline) {
+    useEffect(() => {
+        if (isOffline) {
             return;
         }
 
         Wallet.openEnablePaymentsPage();
-    }
+    }, [isOffline]);
 
-    render() {
-        if (_.isEmpty(this.props.userWallet)) {
-            return <FullScreenLoadingIndicator />;
-        }
-
-        return (
-            <ScreenWrapper includeSafeAreaPaddingBottom={false}>
-                {() => {
-                    if (this.props.userWallet.errorCode === CONST.WALLET.ERROR.KYC) {
-                        return (
-                            <>
-                                <HeaderWithBackButton
-                                    title={this.props.translate('additionalDetailsStep.headerTitle')}
-                                    onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET)}
-                                />
-                                <FailedKYC />
-                            </>
-                        );
-                    }
-
-                    if (this.props.userWallet.shouldShowWalletActivationSuccess) {
-                        return <ActivateStep userWallet={this.props.userWallet} />;
-                    }
-
-                    const currentStep = this.props.userWallet.currentStep || CONST.WALLET.STEP.ADDITIONAL_DETAILS;
+    if (_.isEmpty(userWallet)) {
+        return <FullScreenLoadingIndicator />;
+    }
 
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={EnablePaymentsPage.displayName}
+        >
+            {() => {
+                if (userWallet.errorCode === CONST.WALLET.ERROR.KYC) {
                     return (
                         <>
-                            {(currentStep === CONST.WALLET.STEP.ADDITIONAL_DETAILS || currentStep === CONST.WALLET.STEP.ADDITIONAL_DETAILS_KBA) && <AdditionalDetailsStep />}
-                            {currentStep === CONST.WALLET.STEP.ONFIDO && <OnfidoStep />}
-                            {currentStep === CONST.WALLET.STEP.TERMS && <TermsStep />}
-                            {currentStep === CONST.WALLET.STEP.ACTIVATE && <ActivateStep userWallet={this.props.userWallet} />}
+                            <HeaderWithBackButton
+                                title={translate('additionalDetailsStep.headerTitle')}
+                                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET)}
+                            />
+                            <FailedKYC />
                         </>
                     );
-                }}
-            </ScreenWrapper>
-        );
-    }
+                }
+
+                if (userWallet.shouldShowWalletActivationSuccess) {
+                    return <ActivateStep userWallet={userWallet} />;
+                }
+
+                const currentStep = userWallet.currentStep || CONST.WALLET.STEP.ADDITIONAL_DETAILS;
+
+                switch (currentStep) {
+                    case CONST.WALLET.STEP.ADDITIONAL_DETAILS:
+                    case CONST.WALLET.STEP.ADDITIONAL_DETAILS_KBA:
+                        return <AdditionalDetailsStep />;
+                    case CONST.WALLET.STEP.ONFIDO:
+                        return <OnfidoStep />;
+                    case CONST.WALLET.STEP.TERMS:
+                        return <TermsStep userWallet={userWallet} />;
+                    case CONST.WALLET.STEP.ACTIVATE:
+                        return <ActivateStep userWallet={userWallet} />;
+                    default:
+                        return null;
+                }
+            }}
+        </ScreenWrapper>
+    );
 }
 
+EnablePaymentsPage.displayName = 'EnablePaymentsPage';
 EnablePaymentsPage.propTypes = propTypes;
 EnablePaymentsPage.defaultProps = defaultProps;
 
-export default compose(
-    withLocalize,
-    withOnyx({
-        userWallet: {
-            key: ONYXKEYS.USER_WALLET,
+export default withOnyx({
+    userWallet: {
+        key: ONYXKEYS.USER_WALLET,
 
-            // We want to refresh the wallet each time the user attempts to activate the wallet so we won't use the
-            // stored values here.
-            initWithStoredValues: false,
-        },
-    }),
-    withNetwork(),
-)(EnablePaymentsPage);
+        // We want to refresh the wallet each time the user attempts to activate the wallet so we won't use the
+        // stored values here.
+        initWithStoredValues: false,
+    },
+})(EnablePaymentsPage);
diff --git a/src/pages/EnablePayments/OnfidoStep.js b/src/pages/EnablePayments/OnfidoStep.js
index 31727f51cb69..fc856d813683 100644
--- a/src/pages/EnablePayments/OnfidoStep.js
+++ b/src/pages/EnablePayments/OnfidoStep.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useCallback} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import Onfido from '../../components/Onfido';
 import ONYXKEYS from '../../ONYXKEYS';
@@ -7,18 +7,16 @@ import Navigation from '../../libs/Navigation/Navigation';
 import CONST from '../../CONST';
 import HeaderWithBackButton from '../../components/HeaderWithBackButton';
 import * as Wallet from '../../libs/actions/Wallet';
-import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
-import compose from '../../libs/compose';
+import useLocalize from '../../hooks/useLocalize';
 import Growl from '../../libs/Growl';
 import OnfidoPrivacy from './OnfidoPrivacy';
 import walletOnfidoDataPropTypes from './walletOnfidoDataPropTypes';
 import FullPageOfflineBlockingView from '../../components/BlockingViews/FullPageOfflineBlockingView';
+import ROUTES from '../../ROUTES';
 
 const propTypes = {
     /** Stores various information used to build the UI and call any APIs */
     walletOnfidoData: walletOnfidoDataPropTypes,
-
-    ...withLocalizePropTypes,
 };
 
 const defaultProps = {
@@ -28,60 +26,66 @@ const defaultProps = {
     },
 };
 
-class OnfidoStep extends React.Component {
-    /**
-     * @returns {boolean|*}
-     */
-    canShowOnfido() {
-        return this.props.walletOnfidoData.hasAcceptedPrivacyPolicy && !this.props.walletOnfidoData.isLoading && !this.props.walletOnfidoData.error && this.props.walletOnfidoData.sdkToken;
-    }
+function OnfidoStep({walletOnfidoData}) {
+    const {translate} = useLocalize();
+
+    const shouldShowOnfido = walletOnfidoData.hasAcceptedPrivacyPolicy && !walletOnfidoData.isLoading && !walletOnfidoData.error && walletOnfidoData.sdkToken;
+
+    const goBack = useCallback(() => {
+        Navigation.goBack(ROUTES.HOME);
+    }, []);
+
+    const goToPreviousStep = useCallback(() => {
+        Wallet.updateCurrentStep(CONST.WALLET.STEP.ADDITIONAL_DETAILS);
+    }, []);
+
+    const reportError = useCallback(() => {
+        Growl.error(translate('onfidoStep.genericError'), 10000);
+    }, [translate]);
 
-    render() {
-        return (
-            <>
-                <HeaderWithBackButton
-                    title={this.props.translate('onfidoStep.verifyIdentity')}
-                    onBackButtonPress={() => Wallet.updateCurrentStep(CONST.WALLET.STEP.ADDITIONAL_DETAILS)}
-                />
-                <FullPageOfflineBlockingView>
-                    {this.canShowOnfido() ? (
-                        <Onfido
-                            sdkToken={this.props.walletOnfidoData.sdkToken}
-                            onError={() => {
-                                Growl.error(this.props.translate('onfidoStep.genericError'), 10000);
-                            }}
-                            onUserExit={() => {
-                                Navigation.goBack();
-                            }}
-                            onSuccess={(data) => {
-                                BankAccounts.verifyIdentity({
-                                    onfidoData: JSON.stringify({
-                                        ...data,
-                                        applicantID: this.props.walletOnfidoData.applicantID,
-                                    }),
-                                });
-                            }}
-                        />
-                    ) : (
-                        <OnfidoPrivacy walletOnfidoData={this.props.walletOnfidoData} />
-                    )}
-                </FullPageOfflineBlockingView>
-            </>
-        );
-    }
+    const verifyIdentity = useCallback(
+        (data) => {
+            BankAccounts.verifyIdentity({
+                onfidoData: JSON.stringify({
+                    ...data,
+                    applicantID: walletOnfidoData.applicantID,
+                }),
+            });
+        },
+        [walletOnfidoData.applicantID],
+    );
+
+    return (
+        <>
+            <HeaderWithBackButton
+                title={translate('onfidoStep.verifyIdentity')}
+                onBackButtonPress={goToPreviousStep}
+            />
+            <FullPageOfflineBlockingView>
+                {shouldShowOnfido ? (
+                    <Onfido
+                        sdkToken={walletOnfidoData.sdkToken}
+                        onUserExit={goBack}
+                        onError={reportError}
+                        onSuccess={verifyIdentity}
+                    />
+                ) : (
+                    <OnfidoPrivacy walletOnfidoData={walletOnfidoData} />
+                )}
+            </FullPageOfflineBlockingView>
+        </>
+    );
 }
 
 OnfidoStep.propTypes = propTypes;
 OnfidoStep.defaultProps = defaultProps;
+OnfidoStep.displayName = 'OnfidoStep';
 
-export default compose(
-    withLocalize,
-    withOnyx({
-        walletOnfidoData: {
-            key: ONYXKEYS.WALLET_ONFIDO,
+export default withOnyx({
+    walletOnfidoData: {
+        key: ONYXKEYS.WALLET_ONFIDO,
 
-            // Let's get a new onfido token each time the user hits this flow (as it should only be once)
-            initWithStoredValues: false,
-        },
-    }),
-)(OnfidoStep);
+        // Let's get a new onfido token each time the user hits this flow (as it should only be once)
+        initWithStoredValues: false,
+    },
+})(OnfidoStep);
diff --git a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js
index a6f685fcb562..1b693add95b7 100644
--- a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js
+++ b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js
@@ -5,11 +5,26 @@ import Text from '../../../components/Text';
 import * as Localize from '../../../libs/Localize';
 import CONST from '../../../CONST';
 import TextLink from '../../../components/TextLink';
+import userWalletPropTypes from '../userWalletPropTypes';
 
-function ShortTermsForm() {
+const propTypes = {
+    /** The user's wallet */
+    userWallet: userWalletPropTypes,
+};
+
+const defaultProps = {
+    userWallet: {},
+};
+
+function ShortTermsForm(props) {
     return (
         <>
-            <Text style={styles.mb5}>{Localize.translateLocal('termsStep.shortTermsForm.expensifyPaymentsAccount')}</Text>
+            <Text style={styles.mb5}>
+                {Localize.translateLocal('termsStep.shortTermsForm.expensifyPaymentsAccount', {
+                    walletProgram:
+                        props.userWallet.walletProgramID === CONST.WALLET.MTL_WALLET_PROGRAM_ID ? CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS : CONST.WALLET.PROGRAM_ISSUERS.BANCORP_BANK,
+                })}
+            </Text>
 
             <View style={[styles.shortTermsBorder, styles.p2, styles.mb6]}>
                 <View style={[styles.shortTermsRow, styles.mb4]}>
@@ -132,6 +147,8 @@ function ShortTermsForm() {
     );
 }
 
+ShortTermsForm.propTypes = propTypes;
+ShortTermsForm.defaultProps = defaultProps;
 ShortTermsForm.displayName = 'ShortTermsForm';
 
 export default ShortTermsForm;
diff --git a/src/pages/EnablePayments/TermsStep.js b/src/pages/EnablePayments/TermsStep.js
index e96d93dc4de9..39f4826ec0b2 100644
--- a/src/pages/EnablePayments/TermsStep.js
+++ b/src/pages/EnablePayments/TermsStep.js
@@ -15,8 +15,12 @@ import LongTermsForm from './TermsPage/LongTermsForm';
 import FormAlertWithSubmitButton from '../../components/FormAlertWithSubmitButton';
 import walletTermsPropTypes from './walletTermsPropTypes';
 import * as ErrorUtils from '../../libs/ErrorUtils';
+import userWalletPropTypes from './userWalletPropTypes';
 
 const propTypes = {
+    /** The user's wallet */
+    userWallet: userWalletPropTypes,
+
     /** Comes from Onyx. Information about the terms for the wallet */
     walletTerms: walletTermsPropTypes,
 
@@ -24,6 +28,7 @@ const propTypes = {
 };
 
 const defaultProps = {
+    userWallet: {},
     walletTerms: {},
 };
 
@@ -59,7 +64,7 @@ function TermsStep(props) {
                 style={styles.flex1}
                 contentContainerStyle={styles.ph5}
             >
-                <ShortTermsForm />
+                <ShortTermsForm userWallet={props.userWallet} />
                 <LongTermsForm />
                 <CheckboxWithLabel
                     accessibilityLabel={props.translate('termsStep.haveReadAndAgree')}
diff --git a/src/pages/EnablePayments/userWalletPropTypes.js b/src/pages/EnablePayments/userWalletPropTypes.js
index 2027a1fc15f8..e6b4206be751 100644
--- a/src/pages/EnablePayments/userWalletPropTypes.js
+++ b/src/pages/EnablePayments/userWalletPropTypes.js
@@ -22,4 +22,7 @@ export default PropTypes.shape({
 
     /** Whether we should show the ActivateStep success view after the user finished the KYC flow */
     shouldShowWalletActivationSuccess: PropTypes.bool,
+
+    /** The wallet's programID, used to show the correct terms. */
+    walletProgramID: PropTypes.string,
 });
diff --git a/src/pages/ErrorPage/GenericErrorPage.js b/src/pages/ErrorPage/GenericErrorPage.js
index 3ff3bc686419..02ab38a1ef20 100644
--- a/src/pages/ErrorPage/GenericErrorPage.js
+++ b/src/pages/ErrorPage/GenericErrorPage.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import {View} from 'react-native';
+import {useErrorBoundary} from 'react-error-boundary';
 import Icon from '../../components/Icon';
 import defaultTheme from '../../styles/themes/default';
 import * as Expensicons from '../../components/Icon/Expensicons';
@@ -19,12 +19,11 @@ import * as StyleUtils from '../../styles/StyleUtils';
 
 const propTypes = {
     ...withLocalizePropTypes,
-
-    /** Callback to call on refresh button click */
-    onRefresh: PropTypes.func.isRequired,
 };
 
-function GenericErrorPage(props) {
+function GenericErrorPage({translate}) {
+    const {resetBoundary} = useErrorBoundary();
+
     return (
         <SafeAreaConsumer>
             {({paddingBottom}) => (
@@ -40,12 +39,12 @@ function GenericErrorPage(props) {
                                 />
                             </View>
                             <View style={styles.mb5}>
-                                <Text style={[styles.textHeadline]}>{props.translate('genericErrorPage.title')}</Text>
+                                <Text style={[styles.textHeadline]}>{translate('genericErrorPage.title')}</Text>
                             </View>
                             <View style={styles.mb5}>
                                 <ErrorBodyText />
                                 <Text>
-                                    {`${props.translate('genericErrorPage.body.helpTextConcierge')} `}
+                                    {`${translate('genericErrorPage.body.helpTextConcierge')} `}
                                     <TextLink
                                         href={`mailto:${CONST.EMAIL.CONCIERGE}`}
                                         style={[styles.link]}
@@ -59,17 +58,17 @@ function GenericErrorPage(props) {
                                     <Button
                                         success
                                         medium
-                                        onPress={props.onRefresh}
-                                        text={props.translate('genericErrorPage.refresh')}
+                                        onPress={resetBoundary}
+                                        text={translate('genericErrorPage.refresh')}
                                         style={styles.mr3}
                                     />
                                     <Button
                                         medium
                                         onPress={() => {
                                             Session.signOutAndRedirectToSignIn();
-                                            props.onRefresh();
+                                            resetBoundary();
                                         }}
-                                        text={props.translate('initialSettingsPage.signOut')}
+                                        text={translate('initialSettingsPage.signOut')}
                                     />
                                 </View>
                             </View>
diff --git a/src/pages/ErrorPage/NotFoundPage.js b/src/pages/ErrorPage/NotFoundPage.js
index f0121cd8f3ef..445e81296566 100644
--- a/src/pages/ErrorPage/NotFoundPage.js
+++ b/src/pages/ErrorPage/NotFoundPage.js
@@ -5,7 +5,7 @@ import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoun
 // eslint-disable-next-line rulesdir/no-negated-variables
 function NotFoundPage() {
     return (
-        <ScreenWrapper>
+        <ScreenWrapper testID={NotFoundPage.displayName}>
             <FullPageNotFoundView shouldShow />
         </ScreenWrapper>
     );
diff --git a/src/pages/FlagCommentPage.js b/src/pages/FlagCommentPage.js
index 0b850e6c3849..53da810007ea 100644
--- a/src/pages/FlagCommentPage.js
+++ b/src/pages/FlagCommentPage.js
@@ -2,6 +2,7 @@ import React, {useCallback} from 'react';
 import _ from 'underscore';
 import {View, ScrollView} from 'react-native';
 import PropTypes from 'prop-types';
+import {withOnyx} from 'react-native-onyx';
 import reportPropTypes from './reportPropTypes';
 import reportActionPropTypes from './home/report/reportActionPropTypes';
 import withLocalize, {withLocalizePropTypes} from '../components/withLocalize';
@@ -20,6 +21,7 @@ import * as ReportActionsUtils from '../libs/ReportActionsUtils';
 import * as Session from '../libs/actions/Session';
 import FullPageNotFoundView from '../components/BlockingViews/FullPageNotFoundView';
 import withReportAndReportActionOrNotFound from './home/report/withReportAndReportActionOrNotFound';
+import ONYXKEYS from '../ONYXKEYS';
 
 const propTypes = {
     /** Array of report actions for this report */
@@ -152,7 +154,10 @@ function FlagCommentPage(props) {
     ));
 
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={FlagCommentPage.displayName}
+        >
             {({safeAreaPaddingBottomStyle}) => (
                 <FullPageNotFoundView shouldShow={!ReportUtils.shouldShowFlagComment(getActionToFlag(), props.report)}>
                     <HeaderWithBackButton title={props.translate('reportActionContextMenu.flagAsOffensive')} />
@@ -178,4 +183,13 @@ FlagCommentPage.propTypes = propTypes;
 FlagCommentPage.defaultProps = defaultProps;
 FlagCommentPage.displayName = 'FlagCommentPage';
 
-export default compose(withLocalize, withReportAndReportActionOrNotFound)(FlagCommentPage);
+export default compose(
+    withLocalize,
+    withReportAndReportActionOrNotFound,
+    withOnyx({
+        parentReportActions: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID || report.reportID}`,
+            canEvict: false,
+        },
+    }),
+)(FlagCommentPage);
diff --git a/src/pages/GetAssistancePage.js b/src/pages/GetAssistancePage.js
index 34f996936654..97b498d758b7 100644
--- a/src/pages/GetAssistancePage.js
+++ b/src/pages/GetAssistancePage.js
@@ -78,7 +78,7 @@ function GetAssistancePage(props) {
     }
 
     return (
-        <ScreenWrapper>
+        <ScreenWrapper testID={GetAssistancePage.displayName}>
             <HeaderWithBackButton
                 title={props.translate('getAssistancePage.title')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
diff --git a/src/pages/LogInWithShortLivedAuthTokenPage.js b/src/pages/LogInWithShortLivedAuthTokenPage.js
index 1679d3aa8b5d..62eff262611d 100644
--- a/src/pages/LogInWithShortLivedAuthTokenPage.js
+++ b/src/pages/LogInWithShortLivedAuthTokenPage.js
@@ -8,7 +8,7 @@ import * as Session from '../libs/actions/Session';
 import FullScreenLoadingIndicator from '../components/FullscreenLoadingIndicator';
 import Navigation from '../libs/Navigation/Navigation';
 import styles from '../styles/styles';
-import colors from '../styles/colors';
+import themeColors from '../styles/themes/default';
 import Icon from '../components/Icon';
 import * as Expensicons from '../components/Icon/Expensicons';
 import * as Illustrations from '../components/Icon/Illustrations';
@@ -93,7 +93,7 @@ function LogInWithShortLivedAuthTokenPage(props) {
                 <Icon
                     width={154}
                     height={34}
-                    fill={colors.green}
+                    fill={themeColors.success}
                     src={Expensicons.ExpensifyWordmark}
                 />
             </View>
diff --git a/src/pages/NewChatPage.js b/src/pages/NewChatPage.js
index 4a753c8632bd..c3b66910face 100755
--- a/src/pages/NewChatPage.js
+++ b/src/pages/NewChatPage.js
@@ -5,24 +5,23 @@ import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import OptionsSelector from '../components/OptionsSelector';
 import * as OptionsListUtils from '../libs/OptionsListUtils';
+import Permissions from '../libs/Permissions';
 import * as ReportUtils from '../libs/ReportUtils';
 import ONYXKEYS from '../ONYXKEYS';
 import styles from '../styles/styles';
 import * as Report from '../libs/actions/Report';
 import CONST from '../CONST';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../components/withWindowDimensions';
-import HeaderWithBackButton from '../components/HeaderWithBackButton';
 import ScreenWrapper from '../components/ScreenWrapper';
+import KeyboardAvoidingView from '../components/KeyboardAvoidingView';
 import withLocalize, {withLocalizePropTypes} from '../components/withLocalize';
 import * as Browser from '../libs/Browser';
 import compose from '../libs/compose';
 import personalDetailsPropType from './personalDetailsPropType';
 import reportPropTypes from './reportPropTypes';
+import variables from '../styles/variables';
 
 const propTypes = {
-    /** Whether screen is used to create group chat */
-    isGroupChat: PropTypes.bool,
-
     /** Beta features list */
     betas: PropTypes.arrayOf(PropTypes.string),
 
@@ -38,7 +37,6 @@ const propTypes = {
 };
 
 const defaultProps = {
-    isGroupChat: false,
     betas: [],
     personalDetails: {},
     reports: {},
@@ -46,7 +44,7 @@ const defaultProps = {
 
 const excludedGroupEmails = _.without(CONST.EXPENSIFY_EMAILS, CONST.EMAIL.CONCIERGE);
 
-function NewChatPage(props) {
+function NewChatPage({betas, isGroupChat, personalDetails, reports, translate}) {
     const [searchTerm, setSearchTerm] = useState('');
     const [filteredRecentReports, setFilteredRecentReports] = useState([]);
     const [filteredPersonalDetails, setFilteredPersonalDetails] = useState([]);
@@ -57,31 +55,30 @@ function NewChatPage(props) {
     const headerMessage = OptionsListUtils.getHeaderMessage(
         filteredPersonalDetails.length + filteredRecentReports.length !== 0,
         Boolean(filteredUserToInvite),
-        searchTerm,
+        searchTerm.trim(),
         maxParticipantsReached,
+        _.some(selectedOptions, (participant) => participant.searchText.toLowerCase().includes(searchTerm.trim().toLowerCase())),
     );
-    const isOptionsDataReady = ReportUtils.isReportDataReady() && OptionsListUtils.isPersonalDetailsReady(props.personalDetails);
+    const isOptionsDataReady = ReportUtils.isReportDataReady() && OptionsListUtils.isPersonalDetailsReady(personalDetails);
 
     const sections = useMemo(() => {
         const sectionsList = [];
         let indexOffset = 0;
 
-        if (props.isGroupChat) {
-            sectionsList.push({
-                title: undefined,
-                data: selectedOptions,
-                shouldShow: !_.isEmpty(selectedOptions),
-                indexOffset,
-            });
-            indexOffset += selectedOptions.length;
+        sectionsList.push({
+            title: undefined,
+            data: selectedOptions,
+            shouldShow: !_.isEmpty(selectedOptions),
+            indexOffset,
+        });
+        indexOffset += selectedOptions.length;
 
-            if (maxParticipantsReached) {
-                return sectionsList;
-            }
+        if (maxParticipantsReached) {
+            return sectionsList;
         }
 
         sectionsList.push({
-            title: props.translate('common.recents'),
+            title: translate('common.recents'),
             data: filteredRecentReports,
             shouldShow: !_.isEmpty(filteredRecentReports),
             indexOffset,
@@ -89,7 +86,7 @@ function NewChatPage(props) {
         indexOffset += filteredRecentReports.length;
 
         sectionsList.push({
-            title: props.translate('common.contacts'),
+            title: translate('common.contacts'),
             data: filteredPersonalDetails,
             shouldShow: !_.isEmpty(filteredPersonalDetails),
             indexOffset,
@@ -106,8 +103,7 @@ function NewChatPage(props) {
         }
 
         return sectionsList;
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [filteredPersonalDetails, filteredRecentReports, filteredUserToInvite, maxParticipantsReached, props.isGroupChat, selectedOptions]);
+    }, [translate, filteredPersonalDetails, filteredRecentReports, filteredUserToInvite, maxParticipantsReached, selectedOptions]);
 
     /**
      * Removes a selected option from list if already selected. If not already selected add this option to the list.
@@ -124,18 +120,15 @@ function NewChatPage(props) {
             newSelectedOptions = [...selectedOptions, option];
         }
 
-        const {recentReports, personalDetails, userToInvite} = OptionsListUtils.getNewChatOptions(
-            props.reports,
-            props.personalDetails,
-            props.betas,
-            searchTerm,
-            newSelectedOptions,
-            excludedGroupEmails,
-        );
+        const {
+            recentReports,
+            personalDetails: newChatPersonalDetails,
+            userToInvite,
+        } = OptionsListUtils.getFilteredOptions(reports, personalDetails, betas, searchTerm, newSelectedOptions, excludedGroupEmails);
 
         setSelectedOptions(newSelectedOptions);
         setFilteredRecentReports(recentReports);
-        setFilteredPersonalDetails(personalDetails);
+        setFilteredPersonalDetails(newChatPersonalDetails);
         setFilteredUserToInvite(userToInvite);
     }
 
@@ -154,9 +147,6 @@ function NewChatPage(props) {
      * or navigates to the existing chat if one with those participants already exists.
      */
     const createGroup = () => {
-        if (!props.isGroupChat) {
-            return;
-        }
         const logins = _.pluck(selectedOptions, 'login');
         if (logins.length < 1) {
             return;
@@ -165,49 +155,59 @@ function NewChatPage(props) {
     };
 
     useEffect(() => {
-        const {recentReports, personalDetails, userToInvite} = OptionsListUtils.getNewChatOptions(
-            props.reports,
-            props.personalDetails,
-            props.betas,
-            searchTerm,
-            selectedOptions,
-            props.isGroupChat ? excludedGroupEmails : [],
-        );
+        const {
+            recentReports,
+            personalDetails: newChatPersonalDetails,
+            userToInvite,
+        } = OptionsListUtils.getFilteredOptions(reports, personalDetails, betas, searchTerm, selectedOptions, isGroupChat ? excludedGroupEmails : []);
         setFilteredRecentReports(recentReports);
-        setFilteredPersonalDetails(personalDetails);
+        setFilteredPersonalDetails(newChatPersonalDetails);
         setFilteredUserToInvite(userToInvite);
-        // props.betas and props.isGroupChat are not added as dependencies since they don't change during the component lifecycle
+        // props.betas is not added as dependency since it doesn't change during the component lifecycle
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [props.reports, props.personalDetails, searchTerm]);
+    }, [reports, personalDetails, searchTerm]);
 
     return (
         <ScreenWrapper
+            shouldEnableKeyboardAvoidingView={false}
             includeSafeAreaPaddingBottom={false}
+            includePaddingTop={false}
             shouldEnableMaxHeight
+            testID={NewChatPage.displayName}
         >
-            {({didScreenTransitionEnd, safeAreaPaddingBottomStyle}) => (
-                <>
-                    <HeaderWithBackButton title={props.isGroupChat ? props.translate('sidebarScreen.newGroup') : props.translate('sidebarScreen.newChat')} />
+            {({safeAreaPaddingBottomStyle, insets}) => (
+                <KeyboardAvoidingView
+                    style={{height: '100%'}}
+                    behavior="padding"
+                    // Offset is needed as KeyboardAvoidingView in nested inside of TabNavigator instead of wrapping whole screen.
+                    // This is because when wrapping whole screen the screen was freezing when changing Tabs.
+                    keyboardVerticalOffset={
+                        variables.contentHeaderHeight + insets.top + (Permissions.canUsePolicyRooms(betas) ? variables.tabSelectorButtonHeight + variables.tabSelectorButtonPadding : 0)
+                    }
+                >
                     <View style={[styles.flex1, styles.w100, styles.pRelative, selectedOptions.length > 0 ? safeAreaPaddingBottomStyle : {}]}>
                         <OptionsSelector
-                            canSelectMultipleOptions={props.isGroupChat}
+                            canSelectMultipleOptions
+                            shouldShowMultipleOptionSelectorAsButton
+                            multipleOptionSelectorButtonText={translate('newChatPage.addToGroup')}
+                            onAddToSelection={(option) => toggleOption(option)}
                             sections={sections}
                             selectedOptions={selectedOptions}
                             value={searchTerm}
-                            onSelectRow={(option) => (props.isGroupChat ? toggleOption(option) : createChat(option))}
+                            onSelectRow={(option) => createChat(option)}
                             onChangeText={setSearchTerm}
                             headerMessage={headerMessage}
                             boldStyle
-                            shouldFocusOnSelectRow={props.isGroupChat && !Browser.isMobile()}
-                            shouldShowConfirmButton={props.isGroupChat}
-                            shouldShowOptions={didScreenTransitionEnd && isOptionsDataReady}
-                            confirmButtonText={props.translate('newChatPage.createGroup')}
+                            shouldFocusOnSelectRow={!Browser.isMobile()}
+                            shouldShowOptions={isOptionsDataReady}
+                            shouldShowConfirmButton
+                            confirmButtonText={selectedOptions.length > 1 ? translate('newChatPage.createGroup') : translate('newChatPage.createChat')}
                             onConfirmSelection={createGroup}
-                            textInputLabel={props.translate('optionsSelector.nameEmailOrPhoneNumber')}
+                            textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
                             safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
                         />
                     </View>
-                </>
+                </KeyboardAvoidingView>
             )}
         </ScreenWrapper>
     );
diff --git a/src/pages/NewChatSelectorPage.js b/src/pages/NewChatSelectorPage.js
new file mode 100755
index 000000000000..2ac2ed8177a1
--- /dev/null
+++ b/src/pages/NewChatSelectorPage.js
@@ -0,0 +1,74 @@
+import React from 'react';
+import {withOnyx} from 'react-native-onyx';
+import OnyxTabNavigator, {TopTab} from '../libs/Navigation/OnyxTabNavigator';
+import TabSelector from '../components/TabSelector/TabSelector';
+import Permissions from '../libs/Permissions';
+import NewChatPage from './NewChatPage';
+import WorkspaceNewRoomPage from './workspace/WorkspaceNewRoomPage';
+import CONST from '../CONST';
+import ONYXKEYS from '../ONYXKEYS';
+import withWindowDimensions, {windowDimensionsPropTypes} from '../components/withWindowDimensions';
+import HeaderWithBackButton from '../components/HeaderWithBackButton';
+import ScreenWrapper from '../components/ScreenWrapper';
+import withLocalize, {withLocalizePropTypes} from '../components/withLocalize';
+import compose from '../libs/compose';
+
+const propTypes = {
+    ...windowDimensionsPropTypes,
+
+    ...withLocalizePropTypes,
+};
+
+const defaultProps = {
+    betas: [],
+    personalDetails: {},
+    reports: {},
+};
+
+function NewChatSelectorPage(props) {
+    return (
+        <ScreenWrapper
+            shouldEnableKeyboardAvoidingView={false}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+            testID={NewChatSelectorPage.displayName}
+        >
+            <HeaderWithBackButton title={props.translate('sidebarScreen.fabNewChat')} />
+            {Permissions.canUsePolicyRooms(props.betas) ? (
+                <OnyxTabNavigator
+                    id={CONST.TAB.NEW_CHAT_TAB_ID}
+                    tabBar={({state, navigation, position}) => (
+                        <TabSelector
+                            state={state}
+                            navigation={navigation}
+                            position={position}
+                        />
+                    )}
+                >
+                    <TopTab.Screen
+                        name={CONST.TAB.NEW_CHAT}
+                        component={NewChatPage}
+                    />
+                    <TopTab.Screen
+                        name={CONST.TAB.NEW_ROOM}
+                        component={WorkspaceNewRoomPage}
+                    />
+                </OnyxTabNavigator>
+            ) : (
+                <NewChatPage />
+            )}
+        </ScreenWrapper>
+    );
+}
+
+NewChatSelectorPage.propTypes = propTypes;
+NewChatSelectorPage.defaultProps = defaultProps;
+NewChatSelectorPage.displayName = 'NewChatPage';
+
+export default compose(
+    withLocalize,
+    withWindowDimensions,
+    withOnyx({
+        betas: {key: ONYXKEYS.BETAS},
+    }),
+)(NewChatSelectorPage);
diff --git a/src/pages/NewGroupPage.js b/src/pages/NewGroupPage.js
deleted file mode 100755
index 63f90016e63e..000000000000
--- a/src/pages/NewGroupPage.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-import NewChatPage from './NewChatPage';
-
-function NewGroupPage(props) {
-    return (
-        <NewChatPage
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...props}
-            isGroupChat
-        />
-    );
-}
-
-NewGroupPage.displayName = 'NewGroupPage';
-
-export default NewGroupPage;
diff --git a/src/pages/PrivateNotes/PrivateNotesEditPage.js b/src/pages/PrivateNotes/PrivateNotesEditPage.js
new file mode 100644
index 000000000000..3b94b7859f92
--- /dev/null
+++ b/src/pages/PrivateNotes/PrivateNotesEditPage.js
@@ -0,0 +1,187 @@
+import React, {useState, useRef, useCallback} from 'react';
+import PropTypes from 'prop-types';
+import {Keyboard} from 'react-native';
+import {withOnyx} from 'react-native-onyx';
+import {useFocusEffect} from '@react-navigation/native';
+import lodashGet from 'lodash/get';
+import Str from 'expensify-common/lib/str';
+import ExpensiMark from 'expensify-common/lib/ExpensiMark';
+import _ from 'underscore';
+import withLocalize from '../../components/withLocalize';
+import ScreenWrapper from '../../components/ScreenWrapper';
+import HeaderWithBackButton from '../../components/HeaderWithBackButton';
+import Navigation from '../../libs/Navigation/Navigation';
+import styles from '../../styles/styles';
+import compose from '../../libs/compose';
+import ONYXKEYS from '../../ONYXKEYS';
+import TextInput from '../../components/TextInput';
+import CONST from '../../CONST';
+import Text from '../../components/Text';
+import Form from '../../components/Form';
+import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
+import reportPropTypes from '../reportPropTypes';
+import personalDetailsPropType from '../personalDetailsPropType';
+import * as Report from '../../libs/actions/Report';
+import useLocalize from '../../hooks/useLocalize';
+import OfflineWithFeedback from '../../components/OfflineWithFeedback';
+import updateMultilineInputRange from '../../libs/UpdateMultilineInputRange';
+import ROUTES from '../../ROUTES';
+import * as ReportUtils from '../../libs/ReportUtils';
+
+const propTypes = {
+    /** All of the personal details for everyone */
+    personalDetailsList: PropTypes.objectOf(personalDetailsPropType),
+
+    /** The report currently being looked at */
+    report: reportPropTypes,
+    route: PropTypes.shape({
+        /** Params from the URL path */
+        params: PropTypes.shape({
+            /** reportID and accountID passed via route: /r/:reportID/notes */
+            reportID: PropTypes.string,
+            accountID: PropTypes.string,
+        }),
+    }).isRequired,
+
+    /** Session of currently logged in user */
+    session: PropTypes.shape({
+        /** Currently logged in user accountID */
+        accountID: PropTypes.number,
+    }),
+};
+
+const defaultProps = {
+    report: {},
+    session: {
+        accountID: null,
+    },
+    personalDetailsList: {},
+};
+
+function PrivateNotesEditPage({route, personalDetailsList, session, report}) {
+    const {translate} = useLocalize();
+
+    // We need to edit the note in markdown format, but display it in HTML format
+    const parser = new ExpensiMark();
+    const [privateNote, setPrivateNote] = useState(parser.htmlToMarkdown(lodashGet(report, ['privateNotes', route.params.accountID, 'note'], '')).trim());
+    const isCurrentUserNote = Number(session.accountID) === Number(route.params.accountID);
+
+    // To focus on the input field when the page loads
+    const privateNotesInput = useRef(null);
+    const focusTimeoutRef = useRef(null);
+
+    useFocusEffect(
+        useCallback(() => {
+            focusTimeoutRef.current = setTimeout(() => {
+                if (privateNotesInput.current) {
+                    privateNotesInput.current.focus();
+                }
+                return () => {
+                    if (!focusTimeoutRef.current) {
+                        return;
+                    }
+                    clearTimeout(focusTimeoutRef.current);
+                };
+            }, CONST.ANIMATED_TRANSITION);
+        }, []),
+    );
+
+    const savePrivateNote = () => {
+        const editedNote = parser.replace(privateNote.trim());
+        Report.updatePrivateNotes(report.reportID, route.params.accountID, editedNote);
+        Keyboard.dismiss();
+
+        // Take user back to the PrivateNotesView page
+        Navigation.goBack(ROUTES.HOME);
+    };
+
+    return (
+        <ScreenWrapper
+            shouldEnableMaxHeight
+            includeSafeAreaPaddingBottom={false}
+            testID={PrivateNotesEditPage.displayName}
+        >
+            <FullPageNotFoundView
+                shouldShow={
+                    _.isEmpty(report) ||
+                    _.isEmpty(report.privateNotes) ||
+                    !_.has(report, ['privateNotes', route.params.accountID, 'note']) ||
+                    !isCurrentUserNote ||
+                    ReportUtils.isArchivedRoom(report)
+                }
+                subtitleKey="privateNotes.notesUnavailable"
+            >
+                <HeaderWithBackButton
+                    title={translate('privateNotes.title')}
+                    subtitle={translate('privateNotes.myNote')}
+                    shouldShowBackButton
+                    onCloseButtonPress={() => Navigation.dismissModal()}
+                />
+                <Form
+                    formID={ONYXKEYS.FORMS.PRIVATE_NOTES_FORM}
+                    onSubmit={savePrivateNote}
+                    style={[styles.flexGrow1, styles.ph5]}
+                    submitButtonText={translate('common.save')}
+                    enabledWhenOffline
+                >
+                    <Text style={[styles.mb5]}>
+                        {translate(
+                            Str.extractEmailDomain(lodashGet(personalDetailsList, [route.params.accountID, 'login'], '')) === CONST.EMAIL.GUIDES_DOMAIN
+                                ? 'privateNotes.sharedNoteMessage'
+                                : 'privateNotes.personalNoteMessage',
+                        )}
+                    </Text>
+                    <OfflineWithFeedback
+                        errors={{
+                            ...lodashGet(report, ['privateNotes', route.params.accountID, 'errors'], ''),
+                        }}
+                        onClose={() => Report.clearPrivateNotesError(report.reportID, route.params.accountID)}
+                        style={[styles.mb3]}
+                    >
+                        <TextInput
+                            accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
+                            inputID="privateNotes"
+                            label={translate('privateNotes.composerLabel')}
+                            accessibilityLabel={translate('privateNotes.title')}
+                            autoCompleteType="off"
+                            maxLength={CONST.MAX_COMMENT_LENGTH}
+                            autoCorrect={false}
+                            autoGrowHeight
+                            textAlignVertical="top"
+                            containerStyles={[styles.autoGrowHeightMultilineInput]}
+                            defaultValue={privateNote}
+                            value={privateNote}
+                            onChangeText={(text) => setPrivateNote(text)}
+                            ref={(el) => {
+                                if (!el) {
+                                    return;
+                                }
+                                privateNotesInput.current = el;
+                                updateMultilineInputRange(privateNotesInput.current);
+                            }}
+                        />
+                    </OfflineWithFeedback>
+                </Form>
+            </FullPageNotFoundView>
+        </ScreenWrapper>
+    );
+}
+
+PrivateNotesEditPage.displayName = 'PrivateNotesEditPage';
+PrivateNotesEditPage.propTypes = propTypes;
+PrivateNotesEditPage.defaultProps = defaultProps;
+
+export default compose(
+    withLocalize,
+    withOnyx({
+        report: {
+            key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID.toString()}`,
+        },
+        session: {
+            key: ONYXKEYS.SESSION,
+        },
+        personalDetailsList: {
+            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+        },
+    }),
+)(PrivateNotesEditPage);
diff --git a/src/pages/PrivateNotes/PrivateNotesListPage.js b/src/pages/PrivateNotes/PrivateNotesListPage.js
new file mode 100644
index 000000000000..9ec24fcd9181
--- /dev/null
+++ b/src/pages/PrivateNotes/PrivateNotesListPage.js
@@ -0,0 +1,168 @@
+import React, {useMemo, useEffect} from 'react';
+import {withOnyx} from 'react-native-onyx';
+import PropTypes from 'prop-types';
+import _ from 'underscore';
+import lodashGet from 'lodash/get';
+import {ScrollView} from 'react-native';
+import Navigation from '../../libs/Navigation/Navigation';
+import ONYXKEYS from '../../ONYXKEYS';
+import CONST from '../../CONST';
+import styles from '../../styles/styles';
+import compose from '../../libs/compose';
+import OfflineWithFeedback from '../../components/OfflineWithFeedback';
+import MenuItem from '../../components/MenuItem';
+import useLocalize from '../../hooks/useLocalize';
+import FullScreenLoadingIndicator from '../../components/FullscreenLoadingIndicator';
+import * as Report from '../../libs/actions/Report';
+import personalDetailsPropType from '../personalDetailsPropType';
+import * as UserUtils from '../../libs/UserUtils';
+import reportPropTypes from '../reportPropTypes';
+import ScreenWrapper from '../../components/ScreenWrapper';
+import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
+import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
+import HeaderWithBackButton from '../../components/HeaderWithBackButton';
+import {withNetwork} from '../../components/OnyxProvider';
+import networkPropTypes from '../../components/networkPropTypes';
+import ROUTES from '../../ROUTES';
+import * as ReportUtils from '../../libs/ReportUtils';
+
+const propTypes = {
+    /** The report currently being looked at */
+    report: reportPropTypes,
+    route: PropTypes.shape({
+        /** Params from the URL path */
+        params: PropTypes.shape({
+            /** reportID and accountID passed via route: /r/:reportID/notes */
+            reportID: PropTypes.string,
+            accountID: PropTypes.string,
+        }),
+    }).isRequired,
+
+    /** Session info for the currently logged in user. */
+    session: PropTypes.shape({
+        /** Currently logged in user accountID */
+        accountID: PropTypes.number,
+    }),
+
+    /** All of the personal details for everyone */
+    personalDetailsList: PropTypes.objectOf(personalDetailsPropType),
+
+    /** Information about the network */
+    network: networkPropTypes.isRequired,
+    ...withLocalizePropTypes,
+};
+
+const defaultProps = {
+    report: {},
+    session: {
+        accountID: null,
+    },
+    personalDetailsList: {},
+};
+
+function PrivateNotesListPage({report, personalDetailsList, network, session}) {
+    const {translate} = useLocalize();
+
+    useEffect(() => {
+        if (network.isOffline) {
+            return;
+        }
+        Report.getReportPrivateNote(report.reportID);
+    }, [report.reportID, network.isOffline]);
+
+    /**
+     * Gets the menu item for each workspace
+     *
+     * @param {Object} item
+     * @param {Number} index
+     * @returns {JSX}
+     */
+    function getMenuItem(item, index) {
+        const keyTitle = item.translationKey ? translate(item.translationKey) : item.title;
+
+        return (
+            <OfflineWithFeedback
+                key={`${keyTitle}_${index}`}
+                pendingAction={item.pendingAction}
+                errorRowStyles={styles.ph5}
+                onClose={item.dismissError}
+                errors={item.errors}
+            >
+                <MenuItem
+                    title={keyTitle}
+                    icon={item.icon}
+                    iconType={CONST.ICON_TYPE_WORKSPACE}
+                    onPress={item.action}
+                    shouldShowRightIcon
+                    fallbackIcon={item.fallbackIcon}
+                    brickRoadIndicator={item.brickRoadIndicator}
+                />
+            </OfflineWithFeedback>
+        );
+    }
+
+    /**
+     * Returns a list of private notes on the given chat report
+     * @returns {Array} the menu item list
+     */
+    const privateNotes = useMemo(() => {
+        const privateNoteBrickRoadIndicator = (accountID) => (!_.isEmpty(lodashGet(report, ['privateNotes', accountID, 'errors'], '')) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : '');
+        return _.chain(lodashGet(report, 'privateNotes', {}))
+            .map((privateNote, accountID) => ({
+                title: Number(lodashGet(session, 'accountID', null)) === Number(accountID) ? translate('privateNotes.myNote') : lodashGet(personalDetailsList, [accountID, 'login'], ''),
+                icon: UserUtils.getAvatar(lodashGet(personalDetailsList, [accountID, 'avatar'], UserUtils.getDefaultAvatar(accountID)), accountID),
+                iconType: CONST.ICON_TYPE_AVATAR,
+                action: () => Navigation.navigate(ROUTES.PRIVATE_NOTES_VIEW.getRoute(report.reportID, accountID)),
+                brickRoadIndicator: privateNoteBrickRoadIndicator(accountID),
+            }))
+            .value();
+    }, [report, personalDetailsList, session, translate]);
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={PrivateNotesListPage.displayName}
+        >
+            <FullPageNotFoundView
+                shouldShow={
+                    _.isEmpty(report.reportID) ||
+                    (!report.isLoadingPrivateNotes && network.isOffline && _.isEmpty(lodashGet(report, 'privateNotes', {}))) ||
+                    ReportUtils.isArchivedRoom(report)
+                }
+            >
+                <HeaderWithBackButton
+                    title={translate('privateNotes.title')}
+                    shouldShowBackButton
+                    onCloseButtonPress={() => Navigation.dismissModal()}
+                />
+                <ScrollView contentContainerStyle={styles.flexGrow1}>
+                    {report.isLoadingPrivateNotes && _.isEmpty(lodashGet(report, 'privateNotes', {})) ? (
+                        <FullScreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />
+                    ) : (
+                        _.map(privateNotes, (item, index) => getMenuItem(item, index))
+                    )}
+                </ScrollView>
+            </FullPageNotFoundView>
+        </ScreenWrapper>
+    );
+}
+
+PrivateNotesListPage.propTypes = propTypes;
+PrivateNotesListPage.defaultProps = defaultProps;
+PrivateNotesListPage.displayName = 'PrivateNotesListPage';
+
+export default compose(
+    withLocalize,
+    withOnyx({
+        report: {
+            key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID.toString()}`,
+        },
+        session: {
+            key: ONYXKEYS.SESSION,
+        },
+        personalDetailsList: {
+            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+        },
+    }),
+    withNetwork(),
+)(PrivateNotesListPage);
diff --git a/src/pages/PrivateNotes/PrivateNotesViewPage.js b/src/pages/PrivateNotes/PrivateNotesViewPage.js
new file mode 100644
index 000000000000..4d79f7815ff9
--- /dev/null
+++ b/src/pages/PrivateNotes/PrivateNotesViewPage.js
@@ -0,0 +1,111 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {ScrollView} from 'react-native';
+import {withOnyx} from 'react-native-onyx';
+import lodashGet from 'lodash/get';
+import _ from 'underscore';
+import withLocalize from '../../components/withLocalize';
+import ScreenWrapper from '../../components/ScreenWrapper';
+import HeaderWithBackButton from '../../components/HeaderWithBackButton';
+import Navigation from '../../libs/Navigation/Navigation';
+import styles from '../../styles/styles';
+import compose from '../../libs/compose';
+import ONYXKEYS from '../../ONYXKEYS';
+import ROUTES from '../../ROUTES';
+import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
+import reportPropTypes from '../reportPropTypes';
+import personalDetailsPropType from '../personalDetailsPropType';
+import useLocalize from '../../hooks/useLocalize';
+import OfflineWithFeedback from '../../components/OfflineWithFeedback';
+import MenuItemWithTopDescription from '../../components/MenuItemWithTopDescription';
+import CONST from '../../CONST';
+import * as ReportUtils from '../../libs/ReportUtils';
+
+const propTypes = {
+    /** All of the personal details for everyone */
+    personalDetailsList: PropTypes.objectOf(personalDetailsPropType),
+
+    /** The report currently being looked at */
+    report: reportPropTypes,
+    route: PropTypes.shape({
+        /** Params from the URL path */
+        params: PropTypes.shape({
+            /** reportID and accountID passed via route: /r/:reportID/notes */
+            reportID: PropTypes.string,
+            accountID: PropTypes.string,
+        }),
+    }).isRequired,
+
+    /** Session of currently logged in user */
+    session: PropTypes.shape({
+        /** Currently logged in user accountID */
+        accountID: PropTypes.number,
+    }),
+};
+
+const defaultProps = {
+    report: {},
+    session: {
+        accountID: null,
+    },
+    personalDetailsList: {},
+};
+
+function PrivateNotesViewPage({route, personalDetailsList, session, report}) {
+    const {translate} = useLocalize();
+    const isCurrentUserNote = Number(session.accountID) === Number(route.params.accountID);
+    const privateNote = lodashGet(report, ['privateNotes', route.params.accountID, 'note'], '');
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={PrivateNotesViewPage.displayName}
+        >
+            <FullPageNotFoundView
+                shouldShow={_.isEmpty(report) || _.isEmpty(report.privateNotes) || !_.has(report, ['privateNotes', route.params.accountID, 'note']) || ReportUtils.isArchivedRoom(report)}
+                subtitleKey="privateNotes.notesUnavailable"
+            >
+                <HeaderWithBackButton
+                    title={translate('privateNotes.title')}
+                    subtitle={isCurrentUserNote ? translate('privateNotes.myNote') : `${lodashGet(personalDetailsList, [route.params.accountID, 'login'], '')} note`}
+                    shouldShowBackButton
+                    onCloseButtonPress={() => Navigation.dismissModal()}
+                />
+                <ScrollView style={[styles.flexGrow1]}>
+                    <OfflineWithFeedback pendingAction={lodashGet(report, ['privateNotes', route.params.accountID, 'pendingAction'], null)}>
+                        <MenuItemWithTopDescription
+                            description={translate('privateNotes.composerLabel')}
+                            title={privateNote}
+                            onPress={() => isCurrentUserNote && Navigation.navigate(ROUTES.PRIVATE_NOTES_EDIT.getRoute(report.reportID, route.params.accountID))}
+                            shouldShowRightIcon={isCurrentUserNote}
+                            numberOfLinesTitle={0}
+                            shouldRenderAsHTML
+                            brickRoadIndicator={!_.isEmpty(lodashGet(report, ['privateNotes', route.params.accountID, 'errors'], '')) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''}
+                            disabled={!isCurrentUserNote}
+                            shouldGreyOutWhenDisabled={false}
+                        />
+                    </OfflineWithFeedback>
+                </ScrollView>
+            </FullPageNotFoundView>
+        </ScreenWrapper>
+    );
+}
+
+PrivateNotesViewPage.displayName = 'PrivateNotesViewPage';
+PrivateNotesViewPage.propTypes = propTypes;
+PrivateNotesViewPage.defaultProps = defaultProps;
+
+export default compose(
+    withLocalize,
+    withOnyx({
+        report: {
+            key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID.toString()}`,
+        },
+        session: {
+            key: ONYXKEYS.SESSION,
+        },
+        personalDetailsList: {
+            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+        },
+    }),
+)(PrivateNotesViewPage);
diff --git a/src/pages/ProfilePage.js b/src/pages/ProfilePage.js
index b5ef85e14cbb..7e93f4d99be2 100755
--- a/src/pages/ProfilePage.js
+++ b/src/pages/ProfilePage.js
@@ -36,6 +36,7 @@ import * as Illustrations from '../components/Icon/Illustrations';
 import variables from '../styles/variables';
 import * as ValidationUtils from '../libs/ValidationUtils';
 import Permissions from '../libs/Permissions';
+import ROUTES from '../ROUTES';
 
 const matchType = PropTypes.shape({
     params: PropTypes.shape({
@@ -98,17 +99,11 @@ const getPhoneNumber = (details) => {
 function ProfilePage(props) {
     const accountID = Number(lodashGet(props.route.params, 'accountID', 0));
 
-    // eslint-disable-next-line rulesdir/prefer-early-return
-    useEffect(() => {
-        if (ValidationUtils.isValidAccountRoute(accountID)) {
-            PersonalDetails.openPublicProfilePage(accountID);
-        }
-    }, [accountID]);
-
     const details = lodashGet(props.personalDetails, accountID, ValidationUtils.isValidAccountRoute(accountID) ? {} : {isloading: false});
 
     const displayName = details.displayName ? details.displayName : props.translate('common.hidden');
     const avatar = lodashGet(details, 'avatar', UserUtils.getDefaultAvatar());
+    const fallbackIcon = lodashGet(details, 'fallbackIcon', '');
     const originalFileName = lodashGet(details, 'originalFileName', '');
     const login = lodashGet(details, 'login', '');
     const timezone = lodashGet(details, 'timezone', {});
@@ -138,10 +133,19 @@ function ProfilePage(props) {
     const hasStatus = !!statusEmojiCode && Permissions.canUseCustomStatus(props.betas);
     const statusContent = `${statusEmojiCode}  ${statusText}`;
 
-    const navigateBackTo = lodashGet(props.route, 'params.backTo', '');
+    const navigateBackTo = lodashGet(props.route, 'params.backTo', ROUTES.HOME);
+
+    const chatReportWithCurrentUser = !isCurrentUser && !Session.isAnonymousUser() ? ReportUtils.getChatByParticipants([accountID]) : 0;
+
+    // eslint-disable-next-line rulesdir/prefer-early-return
+    useEffect(() => {
+        if (ValidationUtils.isValidAccountRoute(accountID) && !hasMinimumDetails) {
+            PersonalDetails.openPublicProfilePage(accountID);
+        }
+    }, [accountID, hasMinimumDetails]);
 
     return (
-        <ScreenWrapper>
+        <ScreenWrapper testID={ProfilePage.displayName}>
             <HeaderWithBackButton
                 title={props.translate('common.profile')}
                 onBackButtonPress={() => Navigation.goBack(navigateBackTo)}
@@ -158,6 +162,7 @@ function ProfilePage(props) {
                                 source={UserUtils.getFullSizeAvatar(avatar, accountID)}
                                 isAuthTokenRequired
                                 originalFileName={originalFileName}
+                                fallbackSource={fallbackIcon}
                             >
                                 {({show}) => (
                                     <PressableWithoutFocus
@@ -172,6 +177,7 @@ function ProfilePage(props) {
                                                 imageStyles={[styles.avatarLarge]}
                                                 source={UserUtils.getAvatar(avatar, accountID)}
                                                 size={CONST.AVATAR_SIZE.LARGE}
+                                                fallbackIcon={fallbackIcon}
                                             />
                                         </OfflineWithFeedback>
                                     </PressableWithoutFocus>
@@ -235,6 +241,17 @@ function ProfilePage(props) {
                                 shouldShowRightIcon
                             />
                         )}
+                        {!_.isEmpty(chatReportWithCurrentUser) && (
+                            <MenuItem
+                                title={`${props.translate('privateNotes.title')}`}
+                                titleStyle={styles.flex1}
+                                icon={Expensicons.Pencil}
+                                onPress={() => Navigation.navigate(ROUTES.PRIVATE_NOTES_LIST.getRoute(chatReportWithCurrentUser.reportID))}
+                                wrapperStyle={styles.breakAll}
+                                shouldShowRightIcon
+                                brickRoadIndicator={Report.hasErrorInPrivateNotes(chatReportWithCurrentUser) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''}
+                            />
+                        )}
                     </ScrollView>
                 )}
                 {!hasMinimumDetails && isLoading && <FullScreenLoadingIndicator style={styles.flex1} />}
diff --git a/src/pages/ReimbursementAccount/ACHContractStep.js b/src/pages/ReimbursementAccount/ACHContractStep.js
index 1ef43843571c..761be71d864a 100644
--- a/src/pages/ReimbursementAccount/ACHContractStep.js
+++ b/src/pages/ReimbursementAccount/ACHContractStep.js
@@ -145,7 +145,10 @@ function ACHContractStep(props) {
     };
 
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={ACHContractStep.displayName}
+        >
             <HeaderWithBackButton
                 title={props.translate('beneficialOwnersStep.additionalInformation')}
                 stepCounter={{step: 4, total: 5}}
diff --git a/src/pages/ReimbursementAccount/BankAccountManualStep.js b/src/pages/ReimbursementAccount/BankAccountManualStep.js
index 2416639719fc..9d0b0c1f5bed 100644
--- a/src/pages/ReimbursementAccount/BankAccountManualStep.js
+++ b/src/pages/ReimbursementAccount/BankAccountManualStep.js
@@ -73,7 +73,10 @@ function BankAccountManualStep(props) {
     const shouldDisableInputs = Boolean(lodashGet(reimbursementAccount, 'achData.bankAccountID'));
 
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={BankAccountManualStep.displayName}
+        >
             <HeaderWithBackButton
                 title={translate('workspace.common.connectBankAccount')}
                 stepCounter={{step: 1, total: 5}}
diff --git a/src/pages/ReimbursementAccount/BankAccountPlaidStep.js b/src/pages/ReimbursementAccount/BankAccountPlaidStep.js
index 1168a3ed271d..3fbf2a138384 100644
--- a/src/pages/ReimbursementAccount/BankAccountPlaidStep.js
+++ b/src/pages/ReimbursementAccount/BankAccountPlaidStep.js
@@ -1,4 +1,5 @@
-import React, {useCallback} from 'react';
+import React, {useCallback, useEffect} from 'react';
+import {useIsFocused} from '@react-navigation/native';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
@@ -41,6 +42,7 @@ const defaultProps = {
 
 function BankAccountPlaidStep(props) {
     const {plaidData, receivedRedirectURI, plaidLinkOAuthToken, reimbursementAccount, reimbursementAccountDraft, onBackButtonPress, getDefaultStateForField, translate} = props;
+    const isFocused = useIsFocused();
 
     const validate = useCallback((values) => {
         const errorFields = {};
@@ -51,6 +53,14 @@ function BankAccountPlaidStep(props) {
         return errorFields;
     }, []);
 
+    useEffect(() => {
+        const plaidBankAccounts = lodashGet(plaidData, 'bankAccounts') || [];
+        if (isFocused || plaidBankAccounts.length) {
+            return;
+        }
+        BankAccounts.setBankAccountSubStep(null);
+    }, [isFocused, plaidData]);
+
     const submit = useCallback(() => {
         const selectedPlaidBankAccount = _.findWhere(lodashGet(plaidData, 'bankAccounts', []), {
             plaidAccountID: lodashGet(reimbursementAccountDraft, 'plaidAccountID', ''),
@@ -79,6 +89,7 @@ function BankAccountPlaidStep(props) {
             includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldShowOfflineIndicator={false}
+            testID={BankAccountPlaidStep.displayName}
         >
             <HeaderWithBackButton
                 title={translate('workspace.common.connectBankAccount')}
diff --git a/src/pages/ReimbursementAccount/BankAccountStep.js b/src/pages/ReimbursementAccount/BankAccountStep.js
index 8e718e193efe..b01b46f69350 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';
@@ -49,6 +49,9 @@ const propTypes = {
 
     /* The workspace name */
     policyName: PropTypes.string,
+
+    /* The workspace ID */
+    policyID: PropTypes.string,
 };
 
 const defaultProps = {
@@ -57,6 +60,7 @@ const defaultProps = {
     user: {},
     isPlaidDisabled: false,
     policyName: '',
+    policyID: '',
 };
 
 function BankAccountStep(props) {
@@ -66,7 +70,11 @@ function BankAccountStep(props) {
         subStep = CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID;
     }
     const plaidDesktopMessage = getPlaidDesktopMessage();
-    const bankAccountRoute = `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}${ROUTES.BANK_ACCOUNT}`;
+    const bankAccountRoute = `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}${ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute(
+        'new',
+        props.policyID,
+        ROUTES.WORKSPACE_INITIAL.getRoute(props.policyID),
+    )}`;
 
     if (subStep === CONST.BANK_ACCOUNT.SETUP_TYPE.MANUAL) {
         return (
@@ -91,7 +99,10 @@ function BankAccountStep(props) {
     }
 
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={BankAccountStep.displayName}
+        >
             <View style={[styles.flex1, styles.justifyContentBetween]}>
                 <HeaderWithBackButton
                     title={props.translate('workspace.common.connectBankAccount')}
@@ -146,7 +157,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 +175,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..0ca9b1b7ea92 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -140,7 +140,10 @@ function CompanyStep({reimbursementAccount, reimbursementAccountDraft, getDefaul
     const shouldDisableCompanyTaxID = Boolean(bankAccountID && getDefaultStateForField('companyTaxID'));
 
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={CompanyStep.displayName}
+        >
             <HeaderWithBackButton
                 title={translate('companyStep.headerTitle')}
                 stepCounter={{step: 2, total: 5}}
@@ -224,7 +227,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/ReimbursementAccount/ContinueBankAccountSetup.js b/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js
index 46bd227d82dc..5bde2884be51 100644
--- a/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js
+++ b/src/pages/ReimbursementAccount/ContinueBankAccountSetup.js
@@ -41,7 +41,10 @@ function ContinueBankAccountSetup(props) {
     const errors = lodashGet(props.reimbursementAccount, 'errors', {});
     const pendingAction = lodashGet(props.reimbursementAccount, 'pendingAction', null);
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={ContinueBankAccountSetup.displayName}
+        >
             <HeaderWithBackButton
                 title={props.translate('workspace.common.connectBankAccount')}
                 subtitle={props.policyName}
diff --git a/src/pages/ReimbursementAccount/Enable2FAPrompt.js b/src/pages/ReimbursementAccount/Enable2FAPrompt.js
index 829ac9b63848..33424669903f 100644
--- a/src/pages/ReimbursementAccount/Enable2FAPrompt.js
+++ b/src/pages/ReimbursementAccount/Enable2FAPrompt.js
@@ -13,7 +13,9 @@ const propTypes = {
     ...withLocalizePropTypes,
 };
 function Enable2FAPrompt(props) {
-    const secureYourAccountUrl = encodeURI(`settings?param={"section":"account","action":"enableTwoFactorAuth","exitTo":"${ROUTES.getBankAccountRoute()}","isFromNewDot":"true"}`);
+    const secureYourAccountUrl = encodeURI(
+        `settings?param={"section":"account","action":"enableTwoFactorAuth","exitTo":"${ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute()}","isFromNewDot":"true"}`,
+    );
 
     return (
         <Section
diff --git a/src/pages/ReimbursementAccount/EnableStep.js b/src/pages/ReimbursementAccount/EnableStep.js
index 259aa8e89024..f0cd826f4c43 100644
--- a/src/pages/ReimbursementAccount/EnableStep.js
+++ b/src/pages/ReimbursementAccount/EnableStep.js
@@ -56,6 +56,7 @@ function EnableStep(props) {
         <ScreenWrapper
             style={[styles.flex1, styles.justifyContentBetween]}
             includeSafeAreaPaddingBottom={false}
+            testID={EnableStep.displayName}
         >
             <HeaderWithBackButton
                 title={props.translate('workspace.common.connectBankAccount')}
diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
index 3160ad590c50..afcd84ffa660 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.js
@@ -174,7 +174,7 @@ class ReimbursementAccountPage extends React.Component {
         // user left off in the flow.
         const backTo = lodashGet(this.props.route.params, 'backTo');
         const policyId = lodashGet(this.props.route.params, 'policyID');
-        Navigation.navigate(ROUTES.getBankAccountRoute(this.getRouteForCurrentStep(currentStep), policyId, backTo));
+        Navigation.navigate(ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute(this.getRouteForCurrentStep(currentStep), policyId, backTo));
     }
 
     /*
@@ -206,7 +206,7 @@ class ReimbursementAccountPage extends React.Component {
      * @returns {String}
      */
     getStepToOpenFromRouteParams() {
-        switch (lodashGet(this.props.route, ['params', 'stepToOpen'])) {
+        switch (lodashGet(this.props.route, ['params', 'stepToOpen'], '')) {
             case 'new':
                 return CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT;
             case 'company':
@@ -284,7 +284,7 @@ class ReimbursementAccountPage extends React.Component {
         const currentStep = achData.currentStep || CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT;
         const subStep = achData.subStep;
         const shouldShowOnfido = this.props.onfidoToken && !achData.isOnfidoSetupComplete;
-        const backTo = lodashGet(this.props.route.params, 'backTo');
+        const backTo = lodashGet(this.props.route.params, 'backTo', ROUTES.HOME);
         switch (currentStep) {
             case CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT:
                 if (this.hasInProgressVBBA()) {
@@ -339,7 +339,7 @@ class ReimbursementAccountPage extends React.Component {
 
         if (_.isEmpty(this.props.policy) || !PolicyUtils.isPolicyAdmin(this.props.policy)) {
             return (
-                <ScreenWrapper>
+                <ScreenWrapper testID={ReimbursementAccountPage.displayName}>
                     <FullPageNotFoundView
                         shouldShow
                         onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
@@ -385,7 +385,7 @@ class ReimbursementAccountPage extends React.Component {
 
         if (errorText) {
             return (
-                <ScreenWrapper>
+                <ScreenWrapper testID={ReimbursementAccountPage.displayName}>
                     <HeaderWithBackButton
                         title={this.props.translate('workspace.common.connectBankAccount')}
                         subtitle={policyName}
@@ -405,7 +405,7 @@ class ReimbursementAccountPage extends React.Component {
                     continue={this.continue}
                     policyName={policyName}
                     onBackButtonPress={() => {
-                        Navigation.goBack(lodashGet(this.props.route.params, 'backTo'));
+                        Navigation.goBack(lodashGet(this.props.route.params, 'backTo', ROUTES.HOME));
                     }}
                 />
             );
@@ -421,6 +421,7 @@ class ReimbursementAccountPage extends React.Component {
                     plaidLinkOAuthToken={this.props.plaidLinkToken}
                     getDefaultStateForField={this.getDefaultStateForField}
                     policyName={policyName}
+                    policyID={policyID}
                 />
             );
         }
diff --git a/src/pages/ReimbursementAccount/RequestorOnfidoStep.js b/src/pages/ReimbursementAccount/RequestorOnfidoStep.js
index 5d91f5dae562..72e3850aabd0 100644
--- a/src/pages/ReimbursementAccount/RequestorOnfidoStep.js
+++ b/src/pages/ReimbursementAccount/RequestorOnfidoStep.js
@@ -44,6 +44,7 @@ class RequestorOnfidoStep extends React.Component {
             <ScreenWrapper
                 includeSafeAreaPaddingBottom={false}
                 shouldShowOfflineIndicator={false}
+                testID={RequestorOnfidoStep.displayName}
             >
                 <HeaderWithBackButton
                     title={this.props.translate('requestorStep.headerTitle')}
diff --git a/src/pages/ReimbursementAccount/RequestorStep.js b/src/pages/ReimbursementAccount/RequestorStep.js
index 9831f4b8190c..53ca279c2cb2 100644
--- a/src/pages/ReimbursementAccount/RequestorStep.js
+++ b/src/pages/ReimbursementAccount/RequestorStep.js
@@ -1,9 +1,8 @@
-import React from 'react';
+import React, {useCallback, useMemo} from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
-import lodashGet from 'lodash/get';
+import _ from 'lodash';
 import styles from '../../styles/styles';
-import withLocalize from '../../components/withLocalize';
 import HeaderWithBackButton from '../../components/HeaderWithBackButton';
 import CONST from '../../CONST';
 import TextLink from '../../components/TextLink';
@@ -16,179 +15,188 @@ import ONYXKEYS from '../../ONYXKEYS';
 import RequestorOnfidoStep from './RequestorOnfidoStep';
 import Form from '../../components/Form';
 import ScreenWrapper from '../../components/ScreenWrapper';
-import StepPropTypes from './StepPropTypes';
+import useLocalize from '../../hooks/useLocalize';
+import {reimbursementAccountPropTypes} from './reimbursementAccountPropTypes';
+import ReimbursementAccountDraftPropTypes from './ReimbursementAccountDraftPropTypes';
 
 const propTypes = {
-    ...StepPropTypes,
+    onBackButtonPress: PropTypes.func.isRequired,
+    getDefaultStateForField: PropTypes.func.isRequired,
+    reimbursementAccount: reimbursementAccountPropTypes.isRequired,
+    reimbursementAccountDraft: ReimbursementAccountDraftPropTypes.isRequired,
 
     /** If we should show Onfido flow */
     shouldShowOnfido: PropTypes.bool.isRequired,
 };
 
-class RequestorStep extends React.Component {
-    constructor(props) {
-        super(props);
-
-        this.validate = this.validate.bind(this);
-        this.submit = this.submit.bind(this);
-    }
-
-    /**
-     * @param {Object} values
-     * @returns {Object}
-     */
-    validate(values) {
-        const requiredFields = ['firstName', 'lastName', 'dob', 'ssnLast4', 'requestorAddressStreet', 'requestorAddressCity', 'requestorAddressState', 'requestorAddressZipCode'];
-        const errors = ValidationUtils.getFieldRequiredErrors(values, requiredFields);
-
-        if (values.dob) {
-            if (!ValidationUtils.isValidPastDate(values.dob) || !ValidationUtils.meetsMaximumAgeRequirement(values.dob)) {
-                errors.dob = 'bankAccount.error.dob';
-            } else if (!ValidationUtils.meetsMinimumAgeRequirement(values.dob)) {
-                errors.dob = 'bankAccount.error.age';
-            }
-        }
-
-        if (values.ssnLast4 && !ValidationUtils.isValidSSNLastFour(values.ssnLast4)) {
-            errors.ssnLast4 = 'bankAccount.error.ssnLast4';
-        }
+const REQUIRED_FIELDS = ['firstName', 'lastName', 'dob', 'ssnLast4', 'requestorAddressStreet', 'requestorAddressCity', 'requestorAddressState', 'requestorAddressZipCode'];
+const INPUT_KEYS = {
+    firstName: 'firstName',
+    lastName: 'lastName',
+    dob: 'dob',
+    ssnLast4: 'ssnLast4',
+    street: 'requestorAddressStreet',
+    city: 'requestorAddressCity',
+    state: 'requestorAddressState',
+    zipCode: 'requestorAddressZipCode',
+};
+const STEP_COUNTER = {step: 3, total: 5};
 
-        if (values.requestorAddressStreet && !ValidationUtils.isValidAddress(values.requestorAddressStreet)) {
-            errors.requestorAddressStreet = 'bankAccount.error.addressStreet';
-        }
+const validate = (values) => {
+    const errors = ValidationUtils.getFieldRequiredErrors(values, REQUIRED_FIELDS);
 
-        if (values.requestorAddressZipCode && !ValidationUtils.isValidZipCode(values.requestorAddressZipCode)) {
-            errors.requestorAddressZipCode = 'bankAccount.error.zipCode';
+    if (values.dob) {
+        if (!ValidationUtils.isValidPastDate(values.dob) || !ValidationUtils.meetsMaximumAgeRequirement(values.dob)) {
+            errors.dob = 'bankAccount.error.dob';
+        } else if (!ValidationUtils.meetsMinimumAgeRequirement(values.dob)) {
+            errors.dob = 'bankAccount.error.age';
         }
+    }
 
-        if (!ValidationUtils.isRequiredFulfilled(values.isControllingOfficer)) {
-            errors.isControllingOfficer = 'requestorStep.isControllingOfficerError';
-        }
+    if (values.ssnLast4 && !ValidationUtils.isValidSSNLastFour(values.ssnLast4)) {
+        errors.ssnLast4 = 'bankAccount.error.ssnLast4';
+    }
 
-        return errors;
+    if (values.requestorAddressStreet && !ValidationUtils.isValidAddress(values.requestorAddressStreet)) {
+        errors.requestorAddressStreet = 'bankAccount.error.addressStreet';
     }
 
-    submit(values) {
-        const payload = {
-            bankAccountID: lodashGet(this.props.reimbursementAccount, 'achData.bankAccountID') || 0,
-            ...values,
-        };
+    if (values.requestorAddressZipCode && !ValidationUtils.isValidZipCode(values.requestorAddressZipCode)) {
+        errors.requestorAddressZipCode = 'bankAccount.error.zipCode';
+    }
 
-        BankAccounts.updatePersonalInformationForBankAccount(payload);
+    if (!ValidationUtils.isRequiredFulfilled(values.isControllingOfficer)) {
+        errors.isControllingOfficer = 'requestorStep.isControllingOfficerError';
     }
 
-    render() {
-        if (this.props.shouldShowOnfido) {
-            return (
-                <RequestorOnfidoStep
-                    reimbursementAccount={this.props.reimbursementAccount}
-                    reimbursementAccountDraft={this.props.reimbursementAccountDraft}
-                    onBackButtonPress={this.props.onBackButtonPress}
-                    getDefaultStateForField={this.props.getDefaultStateForField}
-                />
-            );
-        }
+    return errors;
+};
 
+function RequestorStep({reimbursementAccount, shouldShowOnfido, reimbursementAccountDraft, onBackButtonPress, getDefaultStateForField}) {
+    const {translate} = useLocalize();
+
+    const defaultValues = useMemo(
+        () => ({
+            firstName: getDefaultStateForField(INPUT_KEYS.firstName),
+            lastName: getDefaultStateForField(INPUT_KEYS.lastName),
+            street: getDefaultStateForField(INPUT_KEYS.street),
+            city: getDefaultStateForField(INPUT_KEYS.city),
+            state: getDefaultStateForField(INPUT_KEYS.state),
+            zipCode: getDefaultStateForField(INPUT_KEYS.zipCode),
+            dob: getDefaultStateForField(INPUT_KEYS.dob),
+            ssnLast4: getDefaultStateForField(INPUT_KEYS.ssnLast4),
+        }),
+        [getDefaultStateForField],
+    );
+
+    const submit = useCallback(
+        (values) => {
+            const payload = {
+                bankAccountID: _.get(reimbursementAccount, 'achData.bankAccountID', 0),
+                ...values,
+            };
+
+            BankAccounts.updatePersonalInformationForBankAccount(payload);
+        },
+        [reimbursementAccount],
+    );
+
+    const renderLabelComponent = () => (
+        <View style={[styles.flex1, styles.pr1]}>
+            <Text>{translate('requestorStep.isControllingOfficer')}</Text>
+        </View>
+    );
+
+    if (shouldShowOnfido) {
         return (
-            <ScreenWrapper includeSafeAreaPaddingBottom={false}>
-                <HeaderWithBackButton
-                    title={this.props.translate('requestorStep.headerTitle')}
-                    stepCounter={{step: 3, total: 5}}
-                    shouldShowGetAssistanceButton
-                    guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_BANK_ACCOUNT}
-                    onBackButtonPress={this.props.onBackButtonPress}
-                />
-                <Form
-                    formID={ONYXKEYS.REIMBURSEMENT_ACCOUNT}
-                    submitButtonText={this.props.translate('common.saveAndContinue')}
-                    validate={this.validate}
-                    scrollContextEnabled
-                    onSubmit={this.submit}
-                    style={[styles.mh5, styles.flexGrow1]}
-                >
-                    <Text>{this.props.translate('requestorStep.subtitle')}</Text>
-                    <View style={[styles.mb5, styles.mt1, styles.dFlex, styles.flexRow]}>
-                        <TextLink
-                            style={[styles.textMicro]}
-                            // eslint-disable-next-line max-len
-                            href="https://community.expensify.com/discussion/6983/faq-why-do-i-need-to-provide-personal-documentation-when-setting-up-updating-my-bank-account"
-                        >
-                            {`${this.props.translate('requestorStep.learnMore')}`}
-                        </TextLink>
-                        <Text style={[styles.textMicroSupporting]}>{' | '}</Text>
-                        <TextLink
-                            style={[styles.textMicro, styles.textLink]}
-                            // eslint-disable-next-line max-len
-                            href="https://community.expensify.com/discussion/5677/deep-dive-security-how-expensify-protects-your-information"
-                        >
-                            {`${this.props.translate('requestorStep.isMyDataSafe')}`}
-                        </TextLink>
-                    </View>
-                    <IdentityForm
-                        translate={this.props.translate}
-                        defaultValues={{
-                            firstName: this.props.getDefaultStateForField('firstName'),
-                            lastName: this.props.getDefaultStateForField('lastName'),
-                            street: this.props.getDefaultStateForField('requestorAddressStreet'),
-                            city: this.props.getDefaultStateForField('requestorAddressCity'),
-                            state: this.props.getDefaultStateForField('requestorAddressState'),
-                            zipCode: this.props.getDefaultStateForField('requestorAddressZipCode'),
-                            dob: this.props.getDefaultStateForField('dob'),
-                            ssnLast4: this.props.getDefaultStateForField('ssnLast4'),
-                        }}
-                        inputKeys={{
-                            firstName: 'firstName',
-                            lastName: 'lastName',
-                            dob: 'dob',
-                            ssnLast4: 'ssnLast4',
-                            street: 'requestorAddressStreet',
-                            city: 'requestorAddressCity',
-                            state: 'requestorAddressState',
-                            zipCode: 'requestorAddressZipCode',
-                        }}
-                        shouldSaveDraft
-                    />
-                    <CheckboxWithLabel
-                        accessibilityLabel={this.props.translate('requestorStep.isControllingOfficer')}
-                        inputID="isControllingOfficer"
-                        defaultValue={this.props.getDefaultStateForField('isControllingOfficer', false)}
-                        LabelComponent={() => (
-                            <View style={[styles.flex1, styles.pr1]}>
-                                <Text>{this.props.translate('requestorStep.isControllingOfficer')}</Text>
-                            </View>
-                        )}
-                        style={[styles.mt4]}
-                        shouldSaveDraft
-                    />
-                    <Text style={[styles.mt3, styles.textMicroSupporting]}>
-                        {this.props.translate('requestorStep.onFidoConditions')}
-                        <TextLink
-                            href="https://onfido.com/facial-scan-policy-and-release/"
-                            style={[styles.textMicro]}
-                        >
-                            {this.props.translate('onfidoStep.facialScan')}
-                        </TextLink>
-                        {', '}
-                        <TextLink
-                            href="https://onfido.com/privacy/"
-                            style={[styles.textMicro]}
-                        >
-                            {this.props.translate('common.privacy')}
-                        </TextLink>
-                        {` ${this.props.translate('common.and')} `}
-                        <TextLink
-                            href="https://onfido.com/terms-of-service/"
-                            style={[styles.textMicro]}
-                        >
-                            {this.props.translate('common.termsOfService')}
-                        </TextLink>
-                    </Text>
-                </Form>
-            </ScreenWrapper>
+            <RequestorOnfidoStep
+                reimbursementAccount={reimbursementAccount}
+                reimbursementAccountDraft={reimbursementAccountDraft}
+                onBackButtonPress={onBackButtonPress}
+                getDefaultStateForField={getDefaultStateForField}
+            />
         );
     }
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={RequestorStep.displayName}
+        >
+            <HeaderWithBackButton
+                title={translate('requestorStep.headerTitle')}
+                stepCounter={STEP_COUNTER}
+                guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_BANK_ACCOUNT}
+                onBackButtonPress={onBackButtonPress}
+                shouldShowGetAssistanceButton
+            />
+            <Form
+                formID={ONYXKEYS.REIMBURSEMENT_ACCOUNT}
+                submitButtonText={translate('common.saveAndContinue')}
+                validate={validate}
+                onSubmit={submit}
+                style={[styles.mh5, styles.flexGrow1]}
+                scrollContextEnabled
+            >
+                <Text>{translate('requestorStep.subtitle')}</Text>
+                <View style={[styles.mb5, styles.mt1, styles.dFlex, styles.flexRow]}>
+                    <TextLink
+                        style={[styles.textMicro]}
+                        href={CONST.BANK_ACCOUNT_PERSONAL_DOCUMENTATION_INFO_URL}
+                    >
+                        {translate('requestorStep.learnMore')}
+                    </TextLink>
+                    <Text style={[styles.textMicroSupporting]}>{' | '}</Text>
+                    <TextLink
+                        style={[styles.textMicro, styles.textLink]}
+                        href={CONST.PERSONAL_DATA_PROTECTION_INFO_URL}
+                    >
+                        {translate('requestorStep.isMyDataSafe')}
+                    </TextLink>
+                </View>
+                <IdentityForm
+                    translate={translate}
+                    defaultValues={defaultValues}
+                    inputKeys={INPUT_KEYS}
+                    shouldSaveDraft
+                />
+                <CheckboxWithLabel
+                    accessibilityLabel={translate('requestorStep.isControllingOfficer')}
+                    inputID="isControllingOfficer"
+                    defaultValue={getDefaultStateForField('isControllingOfficer', false)}
+                    LabelComponent={renderLabelComponent}
+                    style={[styles.mt4]}
+                    shouldSaveDraft
+                />
+                <Text style={[styles.mt3, styles.textMicroSupporting]}>
+                    {translate('requestorStep.onFidoConditions')}
+                    <TextLink
+                        href={CONST.ONFIDO_FACIAL_SCAN_POLICY_URL}
+                        style={[styles.textMicro]}
+                    >
+                        {translate('onfidoStep.facialScan')}
+                    </TextLink>
+                    {', '}
+                    <TextLink
+                        href={CONST.ONFIDO_PRIVACY_POLICY_URL}
+                        style={[styles.textMicro]}
+                    >
+                        {translate('common.privacy')}
+                    </TextLink>
+                    {` ${translate('common.and')} `}
+                    <TextLink
+                        href={CONST.ONFIDO_TERMS_OF_SERVICE_URL}
+                        style={[styles.textMicro]}
+                    >
+                        {translate('common.termsOfService')}
+                    </TextLink>
+                </Text>
+            </Form>
+        </ScreenWrapper>
+    );
 }
 
 RequestorStep.propTypes = propTypes;
+RequestorStep.displayName = 'RequestorStep';
 
-export default withLocalize(RequestorStep);
+export default React.forwardRef(RequestorStep);
diff --git a/src/pages/ReimbursementAccount/ValidationStep.js b/src/pages/ReimbursementAccount/ValidationStep.js
index 1500759663c0..56aa87c8b47c 100644
--- a/src/pages/ReimbursementAccount/ValidationStep.js
+++ b/src/pages/ReimbursementAccount/ValidationStep.js
@@ -122,6 +122,7 @@ function ValidationStep({reimbursementAccount, translate, onBackButtonPress, acc
         <ScreenWrapper
             style={[styles.flex1, styles.justifyContentBetween]}
             includeSafeAreaPaddingBottom={false}
+            testID={ValidationStep.displayName}
         >
             <HeaderWithBackButton
                 title={isVerifying ? translate('validationStep.headerTitle') : translate('workspace.common.testTransactions')}
diff --git a/src/pages/ReportDetailsPage.js b/src/pages/ReportDetailsPage.js
index 7a3373a8428c..2bf903c88ee8 100644
--- a/src/pages/ReportDetailsPage.js
+++ b/src/pages/ReportDetailsPage.js
@@ -79,7 +79,7 @@ function ReportDetailsPage(props) {
                 translationKey: 'common.shareCode',
                 icon: Expensicons.QrCode,
                 isAnonymousAction: true,
-                action: () => Navigation.navigate(ROUTES.getReportShareCodeRoute(props.report.reportID)),
+                action: () => Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS_SHARE_CODE.getRoute(props.report.reportID)),
             },
         ];
 
@@ -95,7 +95,7 @@ function ReportDetailsPage(props) {
                 subtitle: participants.length,
                 isAnonymousAction: false,
                 action: () => {
-                    Navigation.navigate(ROUTES.getReportParticipantsRoute(props.report.reportID));
+                    Navigation.navigate(ROUTES.REPORT_PARTICIPANTS.getRoute(props.report.reportID));
                 },
             });
         }
@@ -107,12 +107,24 @@ function ReportDetailsPage(props) {
                 icon: Expensicons.Gear,
                 isAnonymousAction: false,
                 action: () => {
-                    Navigation.navigate(ROUTES.getReportSettingsRoute(props.report.reportID));
+                    Navigation.navigate(ROUTES.REPORT_SETTINGS.getRoute(props.report.reportID));
                 },
             });
         }
 
-        if (isUserCreatedPolicyRoom || canLeaveRoom || isThread) {
+        // Prevent displaying private notes option for threads and task reports
+        if (!isThread && !ReportUtils.isTaskReport(props.report)) {
+            items.push({
+                key: CONST.REPORT_DETAILS_MENU_ITEM.PRIVATE_NOTES,
+                translationKey: 'privateNotes.title',
+                icon: Expensicons.Pencil,
+                isAnonymousAction: false,
+                action: () => Navigation.navigate(ROUTES.PRIVATE_NOTES_LIST.getRoute(props.report.reportID)),
+                brickRoadIndicator: Report.hasErrorInPrivateNotes(props.report) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : '',
+            });
+        }
+
+        if (isUserCreatedPolicyRoom || canLeaveRoom) {
             items.push({
                 key: CONST.REPORT_DETAILS_MENU_ITEM.LEAVE_ROOM,
                 translationKey: isThread ? 'common.leaveThread' : 'common.leaveRoom',
@@ -123,7 +135,7 @@ function ReportDetailsPage(props) {
         }
 
         return items;
-    }, [props.report.reportID, participants, isArchivedRoom, shouldDisableSettings, isThread, isUserCreatedPolicyRoom, canLeaveRoom]);
+    }, [props.report, participants, isArchivedRoom, shouldDisableSettings, isThread, isUserCreatedPolicyRoom, canLeaveRoom]);
 
     const displayNamesWithTooltips = useMemo(() => {
         const hasMultipleParticipants = participants.length > 1;
@@ -140,7 +152,7 @@ function ReportDetailsPage(props) {
     ) : null;
 
     return (
-        <ScreenWrapper>
+        <ScreenWrapper testID={ReportDetailsPage.displayName}>
             <FullPageNotFoundView shouldShow={_.isEmpty(props.report)}>
                 <HeaderWithBackButton title={props.translate('common.details')} />
                 <ScrollView style={[styles.flex1]}>
@@ -165,7 +177,7 @@ function ReportDetailsPage(props) {
                                     accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
                                     accessibilityLabel={chatRoomSubtitle}
                                     onPress={() => {
-                                        Navigation.navigate(ROUTES.getWorkspaceInitialRoute(props.report.policyID));
+                                        Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(props.report.policyID));
                                     }}
                                 >
                                     {chatRoomSubtitleText}
@@ -187,7 +199,7 @@ function ReportDetailsPage(props) {
                                 onPress={item.action}
                                 isAnonymousAction={item.isAnonymousAction}
                                 shouldShowRightIcon
-                                brickRoadIndicator={brickRoadIndicator}
+                                brickRoadIndicator={brickRoadIndicator || item.brickRoadIndicator}
                             />
                         );
                     })}
diff --git a/src/pages/ReportParticipantsPage.js b/src/pages/ReportParticipantsPage.js
index 6ccb7a0c2e87..7f453d16817b 100755
--- a/src/pages/ReportParticipantsPage.js
+++ b/src/pages/ReportParticipantsPage.js
@@ -99,7 +99,10 @@ function ReportParticipantsPage(props) {
     }));
 
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={ReportParticipantsPage.displayName}
+        >
             {({safeAreaPaddingBottomStyle}) => (
                 <FullPageNotFoundView shouldShow={_.isEmpty(props.report) || ReportUtils.isArchivedRoom(props.report)}>
                     <HeaderWithBackButton
@@ -127,7 +130,7 @@ function ReportParticipantsPage(props) {
                                     },
                                 ]}
                                 onSelectRow={(option) => {
-                                    Navigation.navigate(ROUTES.getProfileRoute(option.accountID));
+                                    Navigation.navigate(ROUTES.PROFILE.getRoute(option.accountID));
                                 }}
                                 hideSectionHeaders
                                 showTitleTooltip
diff --git a/src/pages/ReportWelcomeMessagePage.js b/src/pages/ReportWelcomeMessagePage.js
index f14b6c48b9dd..7e9ed440d1e8 100644
--- a/src/pages/ReportWelcomeMessagePage.js
+++ b/src/pages/ReportWelcomeMessagePage.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import {View} from 'react-native';
 import ExpensiMark from 'expensify-common/lib/ExpensiMark';
+import {useFocusEffect} from '@react-navigation/native';
 import compose from '../libs/compose';
 import withLocalize, {withLocalizePropTypes} from '../components/withLocalize';
 import ScreenWrapper from '../components/ScreenWrapper';
@@ -19,7 +20,7 @@ import FullPageNotFoundView from '../components/BlockingViews/FullPageNotFoundVi
 import Form from '../components/Form';
 import * as PolicyUtils from '../libs/PolicyUtils';
 import {policyPropTypes, policyDefaultProps} from './workspace/withPolicy';
-import focusAndUpdateMultilineInputRange from '../libs/focusAndUpdateMultilineInputRange';
+import updateMultilineInputRange from '../libs/UpdateMultilineInputRange';
 
 const propTypes = {
     ...withLocalizePropTypes,
@@ -45,6 +46,7 @@ function ReportWelcomeMessagePage(props) {
     const parser = new ExpensiMark();
     const [welcomeMessage, setWelcomeMessage] = useState(parser.htmlToMarkdown(props.report.welcomeMessage));
     const welcomeMessageInputRef = useRef(null);
+    const focusTimeoutRef = useRef(null);
 
     const handleWelcomeMessageChange = useCallback((value) => {
         setWelcomeMessage(value);
@@ -54,55 +56,58 @@ function ReportWelcomeMessagePage(props) {
         Report.updateWelcomeMessage(props.report.reportID, props.report.welcomeMessage, welcomeMessage.trim());
     }, [props.report.reportID, props.report.welcomeMessage, welcomeMessage]);
 
-    return (
-        <ScreenWrapper
-            onEntryTransitionEnd={() => {
-                if (!welcomeMessageInputRef.current) {
-                    return;
+    useFocusEffect(
+        useCallback(() => {
+            focusTimeoutRef.current = setTimeout(() => {
+                if (welcomeMessageInputRef.current) {
+                    welcomeMessageInputRef.current.focus();
                 }
-                focusAndUpdateMultilineInputRange(welcomeMessageInputRef.current);
-            }}
-        >
-            {({didScreenTransitionEnd}) => (
-                <FullPageNotFoundView shouldShow={!PolicyUtils.isPolicyAdmin(props.policy)}>
-                    <HeaderWithBackButton title={props.translate('welcomeMessagePage.welcomeMessage')} />
-                    <Form
-                        style={[styles.flexGrow1, styles.ph5]}
-                        formID={ONYXKEYS.FORMS.WELCOME_MESSAGE_FORM}
-                        onSubmit={submitForm}
-                        submitButtonText={props.translate('common.save')}
-                        enabledWhenOffline
-                    >
-                        <Text style={[styles.mb5]}>{props.translate('welcomeMessagePage.explainerText')}</Text>
-                        <View style={[styles.mb6]}>
-                            <TextInput
-                                inputID="welcomeMessage"
-                                label={props.translate('welcomeMessagePage.welcomeMessage')}
-                                accessibilityLabel={props.translate('welcomeMessagePage.welcomeMessage')}
-                                accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                                autoGrowHeight
-                                maxLength={CONST.MAX_COMMENT_LENGTH}
-                                ref={(el) => {
-                                    // Before updating the DOM, React sets the affected ref.current values to null. After updating the DOM, React immediately sets them to the corresponding DOM nodes
-                                    // to avoid focus multiple time, we should early return if el is null.
-                                    if (!el) {
-                                        return;
-                                    }
-                                    if (!welcomeMessageInputRef.current && didScreenTransitionEnd) {
-                                        focusAndUpdateMultilineInputRange(el);
-                                    }
-                                    welcomeMessageInputRef.current = el;
-                                }}
-                                value={welcomeMessage}
-                                onChangeText={handleWelcomeMessageChange}
-                                autoCapitalize="none"
-                                textAlignVertical="top"
-                                containerStyles={[styles.autoGrowHeightMultilineInput]}
-                            />
-                        </View>
-                    </Form>
-                </FullPageNotFoundView>
-            )}
+                return () => {
+                    if (!focusTimeoutRef.current) {
+                        return;
+                    }
+                    clearTimeout(focusTimeoutRef.current);
+                };
+            }, CONST.ANIMATED_TRANSITION);
+        }, []),
+    );
+
+    return (
+        <ScreenWrapper testID={ReportWelcomeMessagePage.displayName}>
+            <FullPageNotFoundView shouldShow={!PolicyUtils.isPolicyAdmin(props.policy)}>
+                <HeaderWithBackButton title={props.translate('welcomeMessagePage.welcomeMessage')} />
+                <Form
+                    style={[styles.flexGrow1, styles.ph5]}
+                    formID={ONYXKEYS.FORMS.WELCOME_MESSAGE_FORM}
+                    onSubmit={submitForm}
+                    submitButtonText={props.translate('common.save')}
+                    enabledWhenOffline
+                >
+                    <Text style={[styles.mb5]}>{props.translate('welcomeMessagePage.explainerText')}</Text>
+                    <View style={[styles.mb6]}>
+                        <TextInput
+                            inputID="welcomeMessage"
+                            label={props.translate('welcomeMessagePage.welcomeMessage')}
+                            accessibilityLabel={props.translate('welcomeMessagePage.welcomeMessage')}
+                            accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
+                            autoGrowHeight
+                            maxLength={CONST.MAX_COMMENT_LENGTH}
+                            ref={(el) => {
+                                if (!el) {
+                                    return;
+                                }
+                                welcomeMessageInputRef.current = el;
+                                updateMultilineInputRange(welcomeMessageInputRef.current);
+                            }}
+                            value={welcomeMessage}
+                            onChangeText={handleWelcomeMessageChange}
+                            autoCapitalize="none"
+                            textAlignVertical="top"
+                            containerStyles={[styles.autoGrowHeightMultilineInput]}
+                        />
+                    </View>
+                </Form>
+            </FullPageNotFoundView>
         </ScreenWrapper>
     );
 }
diff --git a/src/pages/SearchPage.js b/src/pages/SearchPage.js
index 6505b604b614..141f4e841853 100755
--- a/src/pages/SearchPage.js
+++ b/src/pages/SearchPage.js
@@ -169,7 +169,10 @@ class SearchPage extends Component {
         );
 
         return (
-            <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                testID={SearchPage.displayName}
+            >
                 {({didScreenTransitionEnd, safeAreaPaddingBottomStyle}) => (
                     <>
                         <HeaderWithBackButton title={this.props.translate('common.search')} />
@@ -186,6 +189,7 @@ class SearchPage extends Component {
                                 textInputLabel={this.props.translate('optionsSelector.nameEmailOrPhoneNumber')}
                                 onLayout={this.searchRendered}
                                 safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
+                                autoFocus
                             />
                         </View>
                     </>
diff --git a/src/pages/ShareCodePage.js b/src/pages/ShareCodePage.js
index a81d02c60b36..75bf5fd24f1d 100644
--- a/src/pages/ShareCodePage.js
+++ b/src/pages/ShareCodePage.js
@@ -42,22 +42,22 @@ class ShareCodePage extends React.Component {
 
     render() {
         const isReport = this.props.report != null && this.props.report.reportID != null;
-        const subtitle = ReportUtils.getChatRoomSubtitle(this.props.report);
-
+        const title = isReport ? ReportUtils.getReportName(this.props.report) : this.props.currentUserPersonalDetails.displayName;
+        const formattedEmail = this.props.formatPhoneNumber(this.props.session.email);
+        const subtitle = isReport ? ReportUtils.getParentNavigationSubtitle(this.props.report).workspaceName || ReportUtils.getChatRoomSubtitle(this.props.report) : formattedEmail;
         const urlWithTrailingSlash = Url.addTrailingForwardSlash(this.props.environmentURL);
         const url = isReport
-            ? `${urlWithTrailingSlash}${ROUTES.getReportRoute(this.props.report.reportID)}`
-            : `${urlWithTrailingSlash}${ROUTES.getProfileRoute(this.props.session.accountID)}`;
+            ? `${urlWithTrailingSlash}${ROUTES.REPORT_WITH_ID.getRoute(this.props.report.reportID)}`
+            : `${urlWithTrailingSlash}${ROUTES.PROFILE.getRoute(this.props.session.accountID)}`;
 
         const platform = getPlatform();
         const isNative = platform === CONST.PLATFORM.IOS || platform === CONST.PLATFORM.ANDROID;
-        const formattedEmail = this.props.formatPhoneNumber(this.props.session.email);
 
         return (
-            <ScreenWrapper>
+            <ScreenWrapper testID={ShareCodePage.displayName}>
                 <HeaderWithBackButton
                     title={this.props.translate('common.shareCode')}
-                    onBackButtonPress={() => Navigation.goBack(isReport ? ROUTES.getReportDetailsRoute(this.props.report.reportID) : ROUTES.SETTINGS)}
+                    onBackButtonPress={() => Navigation.goBack(isReport ? ROUTES.REPORT_WITH_ID_DETAILS.getRoute(this.props.report.reportID) : ROUTES.SETTINGS)}
                 />
 
                 <ScrollView style={[styles.flex1, styles.mt3]}>
@@ -65,8 +65,8 @@ class ShareCodePage extends React.Component {
                         <QRShareWithDownload
                             ref={this.qrCodeRef}
                             url={url}
-                            title={isReport ? this.props.report.reportName : this.props.currentUserPersonalDetails.displayName}
-                            subtitle={isReport ? subtitle : formattedEmail}
+                            title={title}
+                            subtitle={subtitle}
                             logo={isReport ? expensifyLogo : UserUtils.getAvatarUrl(this.props.currentUserPersonalDetails.avatar, this.props.currentUserPersonalDetails.accountID)}
                             logoRatio={isReport ? CONST.QR.EXPENSIFY_LOGO_SIZE_RATIO : CONST.QR.DEFAULT_LOGO_SIZE_RATIO}
                             logoMarginRatio={isReport ? CONST.QR.EXPENSIFY_LOGO_MARGIN_RATIO : CONST.QR.DEFAULT_LOGO_MARGIN_RATIO}
diff --git a/src/pages/TeachersUnite/ImTeacherPage.js b/src/pages/TeachersUnite/ImTeacherPage.js
index f077c7724978..a938abf81b79 100644
--- a/src/pages/TeachersUnite/ImTeacherPage.js
+++ b/src/pages/TeachersUnite/ImTeacherPage.js
@@ -1,54 +1,36 @@
 import React from 'react';
-import ScreenWrapper from '../../components/ScreenWrapper';
-import HeaderWithBackButton from '../../components/HeaderWithBackButton';
-import ROUTES from '../../ROUTES';
-import Navigation from '../../libs/Navigation/Navigation';
-import FixedFooter from '../../components/FixedFooter';
-import styles from '../../styles/styles';
-import Button from '../../components/Button';
-import * as Illustrations from '../../components/Icon/Illustrations';
-import variables from '../../styles/variables';
-import useLocalize from '../../hooks/useLocalize';
-import BlockingView from '../../components/BlockingViews/BlockingView';
+import PropTypes from 'prop-types';
+import {withOnyx} from 'react-native-onyx';
+import ONYXKEYS from '../../ONYXKEYS';
+import * as LoginUtils from '../../libs/LoginUtils';
+import ImTeacherUpdateEmailPage from './ImTeacherUpdateEmailPage';
+import IntroSchoolPrincipalPage from './IntroSchoolPrincipalPage';
 
-const propTypes = {};
+const propTypes = {
+    /** Current user session */
+    session: PropTypes.shape({
+        /** Current user primary login */
+        email: PropTypes.string.isRequired,
+    }),
+};
 
-const defaultProps = {};
+const defaultProps = {
+    session: {
+        email: null,
+    },
+};
 
-function ImTeacherPage() {
-    const {translate} = useLocalize();
-
-    return (
-        <ScreenWrapper>
-            <HeaderWithBackButton
-                title={translate('teachersUnitePage.iAmATeacher')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SAVE_THE_WORLD)}
-            />
-            <BlockingView
-                shouldShowLink
-                shouldEmbedLinkWithSubtitle
-                icon={Illustrations.EmailAddress}
-                title={translate('teachersUnitePage.updateYourEmail')}
-                subtitle={translate('teachersUnitePage.schoolMailAsDefault')}
-                linkKey="teachersUnitePage.contactMethods"
-                onLinkPress={() => Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHODS)}
-                iconWidth={variables.signInLogoWidthLargeScreen}
-                iconHeight={variables.lhnLogoWidth}
-            />
-            <FixedFooter style={[styles.flexGrow0]}>
-                <Button
-                    success
-                    accessibilityLabel={translate('teachersUnitePage.updateEmail')}
-                    text={translate('teachersUnitePage.updateEmail')}
-                    onPress={() => Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHODS)}
-                />
-            </FixedFooter>
-        </ScreenWrapper>
-    );
+function ImTeacherPage(props) {
+    const isLoggedInEmailPublicDomain = LoginUtils.isEmailPublicDomain(props.session.email);
+    return isLoggedInEmailPublicDomain ? <ImTeacherUpdateEmailPage /> : <IntroSchoolPrincipalPage />;
 }
 
 ImTeacherPage.propTypes = propTypes;
 ImTeacherPage.defaultProps = defaultProps;
 ImTeacherPage.displayName = 'ImTeacherPage';
 
-export default ImTeacherPage;
+export default withOnyx({
+    session: {
+        key: ONYXKEYS.SESSION,
+    },
+})(ImTeacherPage);
diff --git a/src/pages/TeachersUnite/ImTeacherUpdateEmailPage.js b/src/pages/TeachersUnite/ImTeacherUpdateEmailPage.js
new file mode 100644
index 000000000000..de83c71a01c7
--- /dev/null
+++ b/src/pages/TeachersUnite/ImTeacherUpdateEmailPage.js
@@ -0,0 +1,54 @@
+import React from 'react';
+import ScreenWrapper from '../../components/ScreenWrapper';
+import HeaderWithBackButton from '../../components/HeaderWithBackButton';
+import ROUTES from '../../ROUTES';
+import Navigation from '../../libs/Navigation/Navigation';
+import FixedFooter from '../../components/FixedFooter';
+import styles from '../../styles/styles';
+import Button from '../../components/Button';
+import * as Illustrations from '../../components/Icon/Illustrations';
+import variables from '../../styles/variables';
+import useLocalize from '../../hooks/useLocalize';
+import BlockingView from '../../components/BlockingViews/BlockingView';
+
+const propTypes = {};
+
+const defaultProps = {};
+
+function ImTeacherUpdateEmailPage() {
+    const {translate} = useLocalize();
+
+    return (
+        <ScreenWrapper testID={ImTeacherUpdateEmailPage.displayName}>
+            <HeaderWithBackButton
+                title={translate('teachersUnitePage.iAmATeacher')}
+                onBackButtonPress={() => Navigation.goBack(ROUTES.TEACHERS_UNITE)}
+            />
+            <BlockingView
+                shouldShowLink
+                shouldEmbedLinkWithSubtitle
+                icon={Illustrations.EmailAddress}
+                title={translate('teachersUnitePage.updateYourEmail')}
+                subtitle={translate('teachersUnitePage.schoolMailAsDefault')}
+                linkKey="teachersUnitePage.contactMethods"
+                onLinkPress={() => Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHODS)}
+                iconWidth={variables.signInLogoWidthLargeScreen}
+                iconHeight={variables.lhnLogoWidth}
+            />
+            <FixedFooter style={[styles.flexGrow0]}>
+                <Button
+                    success
+                    accessibilityLabel={translate('teachersUnitePage.updateEmail')}
+                    text={translate('teachersUnitePage.updateEmail')}
+                    onPress={() => Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHODS)}
+                />
+            </FixedFooter>
+        </ScreenWrapper>
+    );
+}
+
+ImTeacherUpdateEmailPage.propTypes = propTypes;
+ImTeacherUpdateEmailPage.defaultProps = defaultProps;
+ImTeacherUpdateEmailPage.displayName = 'ImTeacherUpdateEmailPage';
+
+export default ImTeacherUpdateEmailPage;
diff --git a/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js b/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js
index c225d99f561c..207ff0664053 100644
--- a/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js
+++ b/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js
@@ -34,6 +34,7 @@ const defaultProps = {
 
 function IntroSchoolPrincipalPage(props) {
     const {translate} = useLocalize();
+
     /**
      * @param {Object} values
      * @param {String} values.firstName
@@ -80,10 +81,13 @@ function IntroSchoolPrincipalPage(props) {
     );
 
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={IntroSchoolPrincipalPage.displayName}
+        >
             <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..f6506b96d3f2 100644
--- a/src/pages/TeachersUnite/KnowATeacherPage.js
+++ b/src/pages/TeachersUnite/KnowATeacherPage.js
@@ -91,10 +91,13 @@ function KnowATeacherPage(props) {
     );
 
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={KnowATeacherPage.displayName}
+        >
             <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/TeachersUnite/SaveTheWorldPage.js b/src/pages/TeachersUnite/SaveTheWorldPage.js
index 47c441ad934c..5f252c960f8c 100644
--- a/src/pages/TeachersUnite/SaveTheWorldPage.js
+++ b/src/pages/TeachersUnite/SaveTheWorldPage.js
@@ -5,6 +5,7 @@ import PropTypes from 'prop-types';
 import _ from 'lodash';
 import Navigation from '../../libs/Navigation/Navigation';
 import ROUTES from '../../ROUTES';
+import SCREENS from '../../SCREENS';
 import ONYXKEYS from '../../ONYXKEYS';
 import CONST from '../../CONST';
 import styles from '../../styles/styles';
@@ -13,15 +14,9 @@ import Text from '../../components/Text';
 import MenuItem from '../../components/MenuItem';
 import IllustratedHeaderPageLayout from '../../components/IllustratedHeaderPageLayout';
 import * as LottieAnimations from '../../components/LottieAnimations';
-import * as LoginUtils from '../../libs/LoginUtils';
 import useLocalize from '../../hooks/useLocalize';
 
 const propTypes = {
-    /** Current user session */
-    session: PropTypes.shape({
-        /** Current user primary login */
-        email: PropTypes.string.isRequired,
-    }),
     /** The list of this user's policies */
     policy: PropTypes.shape({
         /** The user's role in the policy */
@@ -30,31 +25,19 @@ const propTypes = {
 };
 
 const defaultProps = {
-    session: {
-        email: null,
-    },
     policy: {},
 };
 
 function SaveTheWorldPage(props) {
     const {translate} = useLocalize();
-    const isLoggedInEmailPublicDomain = LoginUtils.isEmailPublicDomain(props.session.email);
     const isTeacherAlreadyInvited = !_.isUndefined(props.policy) && props.policy.role === CONST.POLICY.ROLE.USER;
 
-    const handleNavigation = () => {
-        if (isLoggedInEmailPublicDomain) {
-            Navigation.navigate(ROUTES.I_AM_A_TEACHER);
-        } else {
-            Navigation.navigate(ROUTES.INTRO_SCHOOL_PRINCIPAL);
-        }
-    };
-
     return (
         <IllustratedHeaderPageLayout
             shouldShowBackButton
             title={translate('sidebarScreen.saveTheWorld')}
-            onBackButtonPress={Navigation.goBack}
-            backgroundColor={themeColors.PAGE_BACKGROUND_COLORS[ROUTES.I_KNOW_A_TEACHER]}
+            backgroundColor={themeColors.PAGE_BACKGROUND_COLORS[SCREENS.SAVE_THE_WORLD.ROOT]}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.HOME)}
             illustration={LottieAnimations.SaveTheWorld}
         >
             <View style={[styles.mb4, styles.justifyContentBetween, styles.mh5]}>
@@ -72,7 +55,7 @@ function SaveTheWorldPage(props) {
                 <MenuItem
                     shouldShowRightIcon
                     title={translate('teachersUnitePage.iAmATeacher')}
-                    onPress={handleNavigation}
+                    onPress={() => Navigation.navigate(ROUTES.I_AM_A_TEACHER)}
                 />
             )}
         </IllustratedHeaderPageLayout>
@@ -84,9 +67,6 @@ SaveTheWorldPage.defaultProps = defaultProps;
 SaveTheWorldPage.displayName = 'SaveTheWorldPage';
 
 export default withOnyx({
-    session: {
-        key: ONYXKEYS.SESSION,
-    },
     policy: {
         key: () => `${ONYXKEYS.COLLECTION.POLICY}${CONST.TEACHERS_UNITE.POLICY_ID}`,
     },
diff --git a/src/pages/ValidateLoginPage/index.js b/src/pages/ValidateLoginPage/index.js
index 561c8512ca3d..0af978172822 100644
--- a/src/pages/ValidateLoginPage/index.js
+++ b/src/pages/ValidateLoginPage/index.js
@@ -6,7 +6,6 @@ import {propTypes as validateLinkPropTypes, defaultProps as validateLinkDefaultP
 import FullScreenLoadingIndicator from '../../components/FullscreenLoadingIndicator';
 import ONYXKEYS from '../../ONYXKEYS';
 import * as Session from '../../libs/actions/Session';
-import useLocalize from '../../hooks/useLocalize';
 import Navigation from '../../libs/Navigation/Navigation';
 
 const propTypes = {
@@ -35,8 +34,6 @@ const defaultProps = {
 };
 
 function ValidateLoginPage(props) {
-    const {preferredLocale} = useLocalize();
-
     useEffect(() => {
         const accountID = lodashGet(props.route.params, 'accountID', '');
         const validateCode = lodashGet(props.route.params, 'validateCode', '');
@@ -46,7 +43,7 @@ function ValidateLoginPage(props) {
             // because we don't want to block the user with the interstitial page.
             Navigation.goBack(false);
         } else {
-            Session.signInWithValidateCodeAndNavigate(accountID, validateCode, preferredLocale);
+            Session.signInWithValidateCodeAndNavigate(accountID, validateCode);
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
diff --git a/src/pages/ValidateLoginPage/index.website.js b/src/pages/ValidateLoginPage/index.website.js
index 323779a7d420..4ac12b3193f3 100644
--- a/src/pages/ValidateLoginPage/index.website.js
+++ b/src/pages/ValidateLoginPage/index.website.js
@@ -7,7 +7,6 @@ import FullScreenLoadingIndicator from '../../components/FullscreenLoadingIndica
 import ValidateCodeModal from '../../components/ValidateCode/ValidateCodeModal';
 import ONYXKEYS from '../../ONYXKEYS';
 import * as Session from '../../libs/actions/Session';
-import useLocalize from '../../hooks/useLocalize';
 import ExpiredValidateCodeModal from '../../components/ValidateCode/ExpiredValidateCodeModal';
 import Navigation from '../../libs/Navigation/Navigation';
 import CONST from '../../CONST';
@@ -49,7 +48,6 @@ const defaultProps = {
 };
 
 function ValidateLoginPage(props) {
-    const {preferredLocale} = useLocalize();
     const login = lodashGet(props, 'credentials.login', null);
     const autoAuthState = lodashGet(props, 'session.autoAuthState', CONST.AUTO_AUTH_STATE.NOT_STARTED);
     const accountID = lodashGet(props.route.params, 'accountID', '');
@@ -71,7 +69,7 @@ function ValidateLoginPage(props) {
         }
 
         // The user has initiated the sign in process on the same browser, in another tab.
-        Session.signInWithValidateCode(accountID, validateCode, preferredLocale);
+        Session.signInWithValidateCode(accountID, validateCode);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
 
diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js
index 74994e4dc9d0..de3e202bf7a3 100644
--- a/src/pages/home/HeaderView.js
+++ b/src/pages/home/HeaderView.js
@@ -1,35 +1,38 @@
-import _ from 'underscore';
+import lodashGet from 'lodash/get';
+import PropTypes from 'prop-types';
 import React from 'react';
 import {View} from 'react-native';
-import PropTypes from 'prop-types';
-import lodashGet from 'lodash/get';
 import {withOnyx} from 'react-native-onyx';
-import styles from '../../styles/styles';
+import _ from 'underscore';
+import GoogleMeetIcon from '../../../assets/images/google-meet.svg';
+import ZoomIcon from '../../../assets/images/zoom-icon.svg';
+import CONST from '../../CONST';
+import ONYXKEYS from '../../ONYXKEYS';
+import DisplayNames from '../../components/DisplayNames';
 import Icon from '../../components/Icon';
 import * as Expensicons from '../../components/Icon/Expensicons';
-import compose from '../../libs/compose';
-import withWindowDimensions, {windowDimensionsPropTypes} from '../../components/withWindowDimensions';
 import MultipleAvatars from '../../components/MultipleAvatars';
+import ParentNavigationSubtitle from '../../components/ParentNavigationSubtitle';
+import PressableWithoutFeedback from '../../components/Pressable/PressableWithoutFeedback';
 import SubscriptAvatar from '../../components/SubscriptAvatar';
-import DisplayNames from '../../components/DisplayNames';
-import * as OptionsListUtils from '../../libs/OptionsListUtils';
+import TaskHeaderActionButton from '../../components/TaskHeaderActionButton';
+import Text from '../../components/Text';
+import ThreeDotsMenu from '../../components/ThreeDotsMenu';
+import Tooltip from '../../components/Tooltip';
 import participantPropTypes from '../../components/participantPropTypes';
-import VideoChatButtonAndMenu from '../../components/VideoChatButtonAndMenu';
 import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
-import CONST from '../../CONST';
+import withWindowDimensions, {windowDimensionsPropTypes} from '../../components/withWindowDimensions';
+import * as OptionsListUtils from '../../libs/OptionsListUtils';
+import * as ReportActionsUtils from '../../libs/ReportActionsUtils';
 import * as ReportUtils from '../../libs/ReportUtils';
-import Text from '../../components/Text';
-import Tooltip from '../../components/Tooltip';
-import colors from '../../styles/colors';
-import reportPropTypes from '../reportPropTypes';
-import ONYXKEYS from '../../ONYXKEYS';
-import ThreeDotsMenu from '../../components/ThreeDotsMenu';
+import * as Link from '../../libs/actions/Link';
+import * as Report from '../../libs/actions/Report';
+import * as Session from '../../libs/actions/Session';
 import * as Task from '../../libs/actions/Task';
-import reportActionPropTypes from './report/reportActionPropTypes';
-import PressableWithoutFeedback from '../../components/Pressable/PressableWithoutFeedback';
-import PinButton from '../../components/PinButton';
-import TaskHeaderActionButton from '../../components/TaskHeaderActionButton';
-import ParentNavigationSubtitle from '../../components/ParentNavigationSubtitle';
+import compose from '../../libs/compose';
+import styles from '../../styles/styles';
+import themeColors from '../../styles/themes/default';
+import reportPropTypes from '../reportPropTypes';
 
 const propTypes = {
     /** Toggles the navigationMenu open and closed */
@@ -44,33 +47,22 @@ const propTypes = {
     /** Onyx Props */
     parentReport: reportPropTypes,
 
-    /** The details about the account that the user is signing in with */
-    account: PropTypes.shape({
-        /** URL to the assigned guide's appointment booking calendar */
-        guideCalendarLink: PropTypes.string,
-    }),
+    /** URL to the assigned guide's appointment booking calendar */
+    guideCalendarLink: PropTypes.string,
 
     /** Current user session */
     session: PropTypes.shape({
         accountID: PropTypes.number,
     }),
 
-    /** The report actions from the parent report */
-    // TO DO: Replace with HOC https://github.com/Expensify/App/issues/18769.
-    // eslint-disable-next-line react/no-unused-prop-types
-    parentReportActions: PropTypes.objectOf(PropTypes.shape(reportActionPropTypes)),
-
     ...windowDimensionsPropTypes,
     ...withLocalizePropTypes,
 };
 
 const defaultProps = {
     personalDetails: {},
-    parentReportActions: {},
     report: null,
-    account: {
-        guideCalendarLink: null,
-    },
+    guideCalendarLink: null,
     parentReport: {},
     session: {
         accountID: 0,
@@ -92,19 +84,22 @@ function HeaderView(props) {
     const parentNavigationSubtitleData = ReportUtils.getParentNavigationSubtitle(reportHeaderData);
     const isConcierge = ReportUtils.hasSingleParticipant(props.report) && _.contains(participants, CONST.ACCOUNT_ID.CONCIERGE);
     const isAutomatedExpensifyAccount = ReportUtils.hasSingleParticipant(props.report) && ReportUtils.hasAutomatedExpensifyAccountIDs(participants);
-    const guideCalendarLink = lodashGet(props.account, 'guideCalendarLink');
+    const parentReportAction = ReportActionsUtils.getParentReportAction(props.report);
+    const isCanceledTaskReport = ReportUtils.isCanceledTaskReport(props.report, parentReportAction);
+    const lastVisibleMessage = ReportActionsUtils.getLastVisibleMessage(props.report.reportID);
+    const isEmptyChat = !props.report.lastMessageText && !props.report.lastMessageTranslationKey && !lastVisibleMessage.lastMessageText && !lastVisibleMessage.lastMessageTranslationKey;
 
     // We hide the button when we are chatting with an automated Expensify account since it's not possible to contact
     // these users via alternative means. It is possible to request a call with Concierge so we leave the option for them.
-    const shouldShowCallButton = (isConcierge && guideCalendarLink) || (!isAutomatedExpensifyAccount && !isTaskReport);
     const threeDotMenuItems = [];
-    if (isTaskReport) {
+    if (isTaskReport && !isCanceledTaskReport) {
         const canModifyTask = Task.canModifyTask(props.report, props.session.accountID);
         if (ReportUtils.isOpenTaskReport(props.report) && canModifyTask) {
             threeDotMenuItems.push({
                 icon: Expensicons.Checkmark,
-                text: props.translate('task.markAsDone'),
-                onSelected: () => Task.completeTask(props.report, title),
+                iconFill: themeColors.icon,
+                text: props.translate('task.markAsComplete'),
+                onSelected: () => Task.completeTask(props.report),
             });
         }
 
@@ -112,8 +107,9 @@ function HeaderView(props) {
         if (ReportUtils.isCompletedTaskReport(props.report) && canModifyTask) {
             threeDotMenuItems.push({
                 icon: Expensicons.Checkmark,
+                iconFill: themeColors.icon,
                 text: props.translate('task.markAsIncomplete'),
-                onSelected: () => Task.reopenTask(props.report, title),
+                onSelected: () => Task.reopenTask(props.report),
             });
         }
 
@@ -121,11 +117,75 @@ function HeaderView(props) {
         if (props.report.stateNum !== CONST.REPORT.STATE_NUM.SUBMITTED && props.report.statusNum !== CONST.REPORT.STATUS.CLOSED && canModifyTask) {
             threeDotMenuItems.push({
                 icon: Expensicons.Trashcan,
+                iconFill: themeColors.icon,
                 text: props.translate('common.cancel'),
                 onSelected: () => Task.cancelTask(props.report.reportID, props.report.reportName, props.report.stateNum, props.report.statusNum),
             });
         }
     }
+
+    if (isChatThread && !isEmptyChat) {
+        if (props.report.notificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN) {
+            threeDotMenuItems.push({
+                icon: Expensicons.ChatBubbles,
+                iconFill: themeColors.icon,
+                text: props.translate('common.joinThread'),
+                onSelected: () => Report.updateNotificationPreference(props.report.reportID, props.report.notificationPreference, CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS, false),
+            });
+        } else if (props.report.notificationPreference.length) {
+            threeDotMenuItems.push({
+                icon: Expensicons.ChatBubbles,
+                iconFill: themeColors.icon,
+                text: props.translate('common.leaveThread'),
+                onSelected: () => Report.leaveRoom(props.report.reportID),
+            });
+        }
+    }
+
+    if (!props.report.isPinned) {
+        threeDotMenuItems.push({
+            icon: Expensicons.Pin,
+            iconFill: themeColors.icon,
+            text: props.translate('common.pin'),
+            onSelected: Session.checkIfActionIsAllowed(() => Report.togglePinnedState(props.report.reportID, props.report.isPinned)),
+        });
+    } else {
+        threeDotMenuItems.push({
+            icon: Expensicons.Pin,
+            iconFill: themeColors.icon,
+            text: props.translate('common.unPin'),
+            onSelected: Session.checkIfActionIsAllowed(() => Report.togglePinnedState(props.report.reportID, props.report.isPinned)),
+        });
+    }
+
+    if (isConcierge && props.guideCalendarLink) {
+        threeDotMenuItems.push({
+            icon: Expensicons.Phone,
+            iconFill: themeColors.icon,
+            text: props.translate('videoChatButtonAndMenu.tooltip'),
+            onSelected: () => {
+                Link.openExternalLink(props.guideCalendarLink);
+            },
+        });
+    } else if (!isAutomatedExpensifyAccount && !isTaskReport) {
+        threeDotMenuItems.push({
+            icon: ZoomIcon,
+            iconFill: themeColors.icon,
+            text: props.translate('videoChatButtonAndMenu.zoom'),
+            onSelected: () => {
+                Link.openExternalLink(CONST.NEW_ZOOM_MEETING_URL);
+            },
+        });
+        threeDotMenuItems.push({
+            icon: GoogleMeetIcon,
+            iconFill: themeColors.icon,
+            text: props.translate('videoChatButtonAndMenu.googleMeet'),
+            onSelected: () => {
+                Link.openExternalLink(CONST.NEW_GOOGLE_MEET_MEETING_URL);
+            },
+        });
+    }
+
     const shouldShowThreeDotsButton = !!threeDotMenuItems.length;
 
     const shouldShowSubscript = ReportUtils.shouldReportShowSubscript(props.report);
@@ -209,20 +269,13 @@ function HeaderView(props) {
                                 <View style={[styles.alignItemsCenter, styles.justifyContentCenter]}>
                                     <Icon
                                         src={Expensicons.DotIndicator}
-                                        fill={colors.red}
+                                        fill={themeColors.danger}
                                     />
                                 </View>
                             )}
                         </PressableWithoutFeedback>
                         <View style={[styles.reportOptions, styles.flexRow, styles.alignItemsCenter]}>
                             {isTaskReport && !props.isSmallScreenWidth && ReportUtils.isOpenTaskReport(props.report) && <TaskHeaderActionButton report={props.report} />}
-                            {shouldShowCallButton && (
-                                <VideoChatButtonAndMenu
-                                    isConcierge={isConcierge}
-                                    guideCalendarLink={guideCalendarLink}
-                                />
-                            )}
-                            <PinButton report={props.report} />
                             {shouldShowThreeDotsButton && (
                                 <ThreeDotsMenu
                                     anchorPosition={styles.threeDotsPopoverOffset(props.windowWidth)}
@@ -244,17 +297,10 @@ export default compose(
     withWindowDimensions,
     withLocalize,
     withOnyx({
-        account: {
+        guideCalendarLink: {
             key: ONYXKEYS.ACCOUNT,
-            selector: (account) =>
-                account && {
-                    guideCalendarLink: account.guideCalendarLink,
-                    primaryLogin: account.primaryLogin,
-                },
-        },
-        parentReportActions: {
-            key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`,
-            canEvict: false,
+            selector: (account) => (account && account.guideCalendarLink) || null,
+            initialValue: null,
         },
         parentReport: {
             key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID || report.reportID}`,
diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index 5d0cb5ab9bf6..c30a8c7ed4a8 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -1,5 +1,6 @@
 import React, {useRef, useState, useEffect, useMemo, useCallback} from 'react';
 import {withOnyx} from 'react-native-onyx';
+import {useFocusEffect} from '@react-navigation/native';
 import PropTypes from 'prop-types';
 import {View} from 'react-native';
 import lodashGet from 'lodash/get';
@@ -15,16 +16,15 @@ import * as ReportUtils from '../../libs/ReportUtils';
 import ReportActionsView from './report/ReportActionsView';
 import ReportActionsSkeletonView from '../../components/ReportActionsSkeletonView';
 import reportActionPropTypes from './report/reportActionPropTypes';
-import {withNetwork} from '../../components/OnyxProvider';
 import compose from '../../libs/compose';
 import Visibility from '../../libs/Visibility';
-import networkPropTypes from '../../components/networkPropTypes';
-import withWindowDimensions, {windowDimensionsPropTypes} from '../../components/withWindowDimensions';
+import useWindowDimensions from '../../hooks/useWindowDimensions';
+import useLocalize from '../../hooks/useLocalize';
 import OfflineWithFeedback from '../../components/OfflineWithFeedback';
 import ReportFooter from './report/ReportFooter';
 import Banner from '../../components/Banner';
-import withLocalize from '../../components/withLocalize';
 import reportPropTypes from '../reportPropTypes';
+import reportMetadataPropTypes from '../reportMetadataPropTypes';
 import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
 import withViewportOffsetTop, {viewportOffsetTopPropTypes} from '../../components/withViewportOffsetTop';
 import * as ReportActionsUtils from '../../libs/ReportActionsUtils';
@@ -33,10 +33,11 @@ import getIsReportFullyVisible from '../../libs/getIsReportFullyVisible';
 import MoneyRequestHeader from '../../components/MoneyRequestHeader';
 import MoneyReportHeader from '../../components/MoneyReportHeader';
 import * as ComposerActions from '../../libs/actions/Composer';
-import ReportScreenContext from './ReportScreenContext';
+import {ActionListContext, ReactionListContext} from './ReportScreenContext';
 import TaskHeaderActionButton from '../../components/TaskHeaderActionButton';
 import DragAndDropProvider from '../../components/DragAndDrop/Provider';
 import usePrevious from '../../hooks/usePrevious';
+import CONST from '../../CONST';
 import withCurrentReportID, {withCurrentReportIDPropTypes, withCurrentReportIDDefaultProps} from '../../components/withCurrentReportID';
 
 const propTypes = {
@@ -58,6 +59,9 @@ const propTypes = {
     /** The report currently being looked at */
     report: reportPropTypes,
 
+    /** The report metadata loading states */
+    reportMetadata: reportMetadataPropTypes,
+
     /** Array of report actions for this report */
     reportActions: PropTypes.arrayOf(PropTypes.shape(reportActionPropTypes)),
 
@@ -78,16 +82,18 @@ const propTypes = {
         }),
     ),
 
-    /** Information about the network */
-    network: networkPropTypes.isRequired,
-
     /** The account manager report ID */
     accountManagerReportID: PropTypes.string,
 
     /** All of the personal details for everyone */
     personalDetails: PropTypes.objectOf(personalDetailsPropType),
 
-    ...windowDimensionsPropTypes,
+    /** Onyx function that marks the component ready for hydration */
+    markReadyForHydration: PropTypes.func,
+
+    /** Whether user is leaving the current report */
+    userLeavingStatus: PropTypes.bool,
+
     ...viewportOffsetTopPropTypes,
     ...withCurrentReportIDPropTypes,
 };
@@ -97,16 +103,30 @@ const defaultProps = {
     reportActions: [],
     report: {
         hasOutstandingIOU: false,
+    },
+    reportMetadata: {
         isLoadingReportActions: false,
+        isLoadingMoreReportActions: false,
     },
     isComposerFullSize: false,
     betas: [],
     policies: {},
     accountManagerReportID: null,
+    userLeavingStatus: false,
     personalDetails: {},
+    markReadyForHydration: null,
     ...withCurrentReportIDDefaultProps,
 };
 
+/**
+ *
+ * Function to check weather the report available in props is default
+ *
+ * @param {Object} report
+ * @returns {Boolean}
+ */
+const checkDefaultReport = (report) => report === defaultProps.report;
+
 /**
  * Get the currently viewed report ID as number
  *
@@ -123,25 +143,27 @@ function ReportScreen({
     betas,
     route,
     report,
+    reportMetadata,
     reportActions,
     accountManagerReportID,
     personalDetails,
+    markReadyForHydration,
     policies,
-    translate,
-    network,
-    isSmallScreenWidth,
     isSidebarLoaded,
     viewportOffsetTop,
     isComposerFullSize,
     errors,
+    userLeavingStatus,
     currentReportID,
 }) {
+    const {translate} = useLocalize();
+    const {isSmallScreenWidth} = useWindowDimensions();
+
     const firstRenderRef = useRef(true);
     const flatListRef = useRef();
     const reactionListRef = useRef();
     const prevReport = usePrevious(report);
-
-    const [skeletonViewContainerHeight, setSkeletonViewContainerHeight] = useState(0);
+    const prevUserLeavingStatus = usePrevious(userLeavingStatus);
     const [isBannerVisible, setIsBannerVisible] = useState(true);
 
     const reportID = getReportID(route);
@@ -149,19 +171,24 @@ function ReportScreen({
     const screenWrapperStyle = [styles.appContent, styles.flex1, {marginTop: viewportOffsetTop}];
 
     // There are no reportActions at all to display and we are still in the process of loading the next set of actions.
-    const isLoadingInitialReportActions = _.isEmpty(reportActions) && report.isLoadingReportActions;
+    const isLoadingInitialReportActions = _.isEmpty(reportActions) && reportMetadata.isLoadingReportActions;
+
+    const isOptimisticDelete = lodashGet(report, 'statusNum') === CONST.REPORT.STATUS.CLOSED;
 
     const shouldHideReport = !ReportUtils.canAccessReport(report, policies, betas);
 
-    const isLoading = !reportID || !isSidebarLoaded || _.isEmpty(personalDetails) || firstRenderRef.current;
+    const isLoading = !reportID || !isSidebarLoaded || _.isEmpty(personalDetails);
 
     const parentReportAction = ReportActionsUtils.getParentReportAction(report);
     const isDeletedParentAction = ReportActionsUtils.isDeletedParentAction(parentReportAction);
     const isSingleTransactionView = ReportUtils.isMoneyRequest(report);
 
-    const policy = policies[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`];
+    const policy = policies[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`] || {};
 
     const isTopMostReportId = currentReportID === getReportID(route);
+    const didSubscribeToReportLeavingEvents = useRef(false);
+
+    const isDefaultReport = checkDefaultReport(report);
 
     let headerView = (
         <HeaderView
@@ -219,7 +246,7 @@ function ReportScreen({
         }
 
         // It possible that we may not have the report object yet in Onyx yet e.g. we navigated to a URL for an accessible report that
-        // is not stored locally yet. If props.report.reportID exists, then the report has been stored locally and nothing more needs to be done.
+        // is not stored locally yet. If report.reportID exists, then the report has been stored locally and nothing more needs to be done.
         // If it doesn't exist, then we fetch the report from the API.
         if (report.reportID && report.reportID === getReportID(route)) {
             return;
@@ -232,7 +259,7 @@ function ReportScreen({
     }, []);
 
     const chatWithAccountManager = useCallback(() => {
-        Navigation.navigate(ROUTES.getReportRoute(accountManagerReportID));
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(accountManagerReportID));
     }, [accountManagerReportID]);
 
     /**
@@ -245,25 +272,36 @@ function ReportScreen({
         [route],
     );
 
-    useEffect(() => {
-        const unsubscribeVisibilityListener = Visibility.onVisibilityChange(() => {
-            // If the report is not fully visible (AKA on small screen devices and LHR is open) or the report is optimistic (AKA not yet created)
-            // we don't need to call openReport
-            if (!getIsReportFullyVisible(isTopMostReportId) || report.isOptimisticReport) {
-                return;
-            }
-
-            Report.openReport(report.reportID);
-        });
+    useFocusEffect(
+        useCallback(() => {
+            const unsubscribeVisibilityListener = Visibility.onVisibilityChange(() => {
+                const isTopMostReportID = Navigation.getTopmostReportId() === getReportID(route);
+                // If the report is not fully visible (AKA on small screen devices and LHR is open) or the report is optimistic (AKA not yet created)
+                // we don't need to call openReport
+                if (!getIsReportFullyVisible(isTopMostReportID) || report.isOptimisticReport) {
+                    return;
+                }
+
+                Report.openReport(report.reportID);
+            });
+
+            return () => unsubscribeVisibilityListener();
+            // The effect should run only on the first focus to attach listener
+            // eslint-disable-next-line react-hooks/exhaustive-deps
+        }, []),
+    );
 
+    useEffect(() => {
         fetchReportIfNeeded();
         ComposerActions.setShouldShowComposeInput(true);
         return () => {
-            if (!unsubscribeVisibilityListener) {
+            if (!didSubscribeToReportLeavingEvents) {
                 return;
             }
-            unsubscribeVisibilityListener();
+
+            Report.unsubscribeFromLeavingRoomReportChannel(report.reportID);
         };
+
         // I'm disabling the warning, as it expects to use exhaustive deps, even though we want this useEffect to run only on the first render.
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, []);
@@ -274,120 +312,153 @@ function ReportScreen({
             firstRenderRef.current = false;
             return;
         }
+
+        const onyxReportID = report.reportID;
+        const prevOnyxReportID = prevReport.reportID;
+        const routeReportID = getReportID(route);
+
+        // Navigate to the Concierge chat if the room was removed from another device (e.g. user leaving a room)
+        if (
+            // non-optimistic case
+            (!prevUserLeavingStatus && userLeavingStatus) ||
+            // optimistic case
+            (prevOnyxReportID && prevOnyxReportID === routeReportID && !onyxReportID && prevReport.statusNum === CONST.REPORT.STATUS.OPEN && report.statusNum === CONST.REPORT.STATUS.CLOSED)
+        ) {
+            Navigation.goBack();
+            Report.navigateToConciergeChat();
+            return;
+        }
+
         // If you already have a report open and are deeplinking to a new report on native,
         // the ReportScreen never actually unmounts and the reportID in the route also doesn't change.
         // Therefore, we need to compare if the existing reportID is the same as the one in the route
         // before deciding that we shouldn't call OpenReport.
-        const onyxReportID = report.reportID;
-        const routeReportID = getReportID(route);
         if (onyxReportID === prevReport.reportID && (!onyxReportID || onyxReportID === routeReportID)) {
             return;
         }
 
         fetchReportIfNeeded();
         ComposerActions.setShouldShowComposeInput(true);
-    }, [route, report, errors, fetchReportIfNeeded, prevReport.reportID]);
+    }, [route, report, errors, fetchReportIfNeeded, prevReport.reportID, prevUserLeavingStatus, userLeavingStatus, prevReport.statusNum]);
+
+    useEffect(() => {
+        // Ensures subscription event succeeds when the report/workspace room is created optimistically.
+        // Check if the optimistic `OpenReport` or `AddWorkspaceRoom` has succeeded by confirming
+        // any `pendingFields.createChat` or `pendingFields.addWorkspaceRoom` fields are set to null.
+        // Existing reports created will have empty fields for `pendingFields`.
+        const didCreateReportSuccessfully = !report.pendingFields || (!report.pendingFields.addWorkspaceRoom && !report.pendingFields.createChat);
+        if (!didSubscribeToReportLeavingEvents.current && didCreateReportSuccessfully) {
+            Report.subscribeToReportLeavingEvents(reportID);
+            didSubscribeToReportLeavingEvents.current = true;
+        }
+    }, [report, didSubscribeToReportLeavingEvents, reportID]);
+
+    const onListLayout = useCallback(() => {
+        if (!markReadyForHydration) {
+            return;
+        }
+
+        markReadyForHydration();
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundPage = useMemo(
+        () =>
+            (!firstRenderRef.current &&
+                !_.isEmpty(report) &&
+                !isDefaultReport &&
+                !report.reportID &&
+                !isOptimisticDelete &&
+                !report.isLoadingReportActions &&
+                !isLoading &&
+                !userLeavingStatus) ||
+            shouldHideReport,
+        [report, isLoading, shouldHideReport, isDefaultReport, isOptimisticDelete, userLeavingStatus],
+    );
 
     return (
-        <ReportScreenContext.Provider
-            value={{
-                flatListRef,
-                reactionListRef,
-            }}
-        >
-            <ScreenWrapper
-                style={screenWrapperStyle}
-                shouldEnableKeyboardAvoidingView={isTopMostReportId}
-            >
-                <FullPageNotFoundView
-                    shouldShow={(!report.reportID && !report.isLoadingReportActions && !isLoading) || shouldHideReport}
-                    subtitleKey="notFound.noAccess"
-                    shouldShowCloseButton={false}
-                    shouldShowBackButton={isSmallScreenWidth}
-                    onBackButtonPress={Navigation.goBack}
-                    shouldShowLink={false}
+        <ActionListContext.Provider value={flatListRef}>
+            <ReactionListContext.Provider value={reactionListRef}>
+                <ScreenWrapper
+                    style={screenWrapperStyle}
+                    shouldEnableKeyboardAvoidingView={isTopMostReportId}
+                    testID={ReportScreen.displayName}
                 >
-                    <OfflineWithFeedback
-                        pendingAction={addWorkspaceRoomOrChatPendingAction}
-                        errors={addWorkspaceRoomOrChatErrors}
-                        shouldShowErrorMessages={false}
-                        needsOffscreenAlphaCompositing
+                    <FullPageNotFoundView
+                        shouldShow={shouldShowNotFoundPage}
+                        subtitleKey="notFound.noAccess"
+                        shouldShowCloseButton={false}
+                        shouldShowBackButton={isSmallScreenWidth}
+                        onBackButtonPress={Navigation.goBack}
+                        shouldShowLink={false}
                     >
-                        {headerView}
-                        {ReportUtils.isTaskReport(report) && isSmallScreenWidth && ReportUtils.isOpenTaskReport(report) && (
-                            <View style={[styles.borderBottom]}>
-                                <View style={[styles.appBG, styles.pl0]}>
-                                    <View style={[styles.ph5, styles.pb3]}>
-                                        <TaskHeaderActionButton report={report} />
+                        <OfflineWithFeedback
+                            pendingAction={addWorkspaceRoomOrChatPendingAction}
+                            errors={addWorkspaceRoomOrChatErrors}
+                            shouldShowErrorMessages={false}
+                            needsOffscreenAlphaCompositing
+                        >
+                            {headerView}
+                            {ReportUtils.isTaskReport(report) && isSmallScreenWidth && ReportUtils.isOpenTaskReport(report, parentReportAction) && (
+                                <View style={[styles.borderBottom]}>
+                                    <View style={[styles.appBG, styles.pl0]}>
+                                        <View style={[styles.ph5, styles.pb3]}>
+                                            <TaskHeaderActionButton report={report} />
+                                        </View>
                                     </View>
                                 </View>
-                            </View>
-                        )}
-                    </OfflineWithFeedback>
-                    {Boolean(accountManagerReportID) && ReportUtils.isConciergeChatReport(report) && isBannerVisible && (
-                        <Banner
-                            containerStyles={[styles.mh4, styles.mt4, styles.p4, styles.bgDark]}
-                            textStyles={[styles.colorReversed]}
-                            text={translate('reportActionsView.chatWithAccountManager')}
-                            onClose={dismissBanner}
-                            onPress={chatWithAccountManager}
-                            shouldShowCloseButton
-                        />
-                    )}
-                    <DragAndDropProvider isDisabled={!isReportReadyForDisplay}>
-                        <View
-                            style={[styles.flex1, styles.justifyContentEnd, styles.overflowHidden]}
-                            onLayout={(event) => {
-                                // Rounding this value for comparison because they can look like this: 411.9999694824219
-                                const newSkeletonViewContainerHeight = Math.round(event.nativeEvent.layout.height);
-
-                                // The height can be 0 if the component unmounts - we are not interested in this value and want to know how much space it
-                                // takes up so we can set the skeleton view container height.
-                                if (newSkeletonViewContainerHeight === 0) {
-                                    return;
-                                }
-                                setSkeletonViewContainerHeight(newSkeletonViewContainerHeight);
-                            }}
-                        >
-                            {isReportReadyForDisplay && !isLoadingInitialReportActions && !isLoading && (
-                                <ReportActionsView
-                                    reportActions={reportActions}
-                                    report={report}
-                                    isComposerFullSize={isComposerFullSize}
-                                    parentViewHeight={skeletonViewContainerHeight}
-                                    policy={policy}
-                                />
                             )}
+                        </OfflineWithFeedback>
+                        {!!accountManagerReportID && ReportUtils.isConciergeChatReport(report) && isBannerVisible && (
+                            <Banner
+                                containerStyles={[styles.mh4, styles.mt4, styles.p4, styles.bgDark]}
+                                textStyles={[styles.colorReversed]}
+                                text={translate('reportActionsView.chatWithAccountManager')}
+                                onClose={dismissBanner}
+                                onPress={chatWithAccountManager}
+                                shouldShowCloseButton
+                            />
+                        )}
+                        <DragAndDropProvider isDisabled={!isReportReadyForDisplay}>
+                            <View
+                                style={[styles.flex1, styles.justifyContentEnd, styles.overflowHidden]}
+                                onLayout={onListLayout}
+                            >
+                                {isReportReadyForDisplay && !isLoadingInitialReportActions && !isLoading && (
+                                    <ReportActionsView
+                                        reportActions={reportActions}
+                                        report={report}
+                                        isLoadingReportActions={reportMetadata.isLoadingReportActions}
+                                        isLoadingMoreReportActions={reportMetadata.isLoadingMoreReportActions}
+                                        isComposerFullSize={isComposerFullSize}
+                                        policy={policy}
+                                    />
+                                )}
 
-                            {/* Note: The report should be allowed to mount even if the initial report actions are not loaded. If we prevent rendering the report while they are loading then
-                            we'll unnecessarily unmount the ReportActionsView which will clear the new marker lines initial state. */}
-                            {(!isReportReadyForDisplay || isLoadingInitialReportActions || isLoading) && <ReportActionsSkeletonView containerHeight={skeletonViewContainerHeight} />}
+                                {/* Note: The ReportActionsSkeletonView should be allowed to mount even if the initial report actions are not loaded.
+                                    If we prevent rendering the report while they are loading then
+                                    we'll unnecessarily unmount the ReportActionsView which will clear the new marker lines initial state. */}
+                                {(!isReportReadyForDisplay || isLoadingInitialReportActions || isLoading) && <ReportActionsSkeletonView />}
 
-                            {isReportReadyForDisplay && (
-                                <>
+                                {isReportReadyForDisplay ? (
                                     <ReportFooter
                                         pendingAction={addWorkspaceRoomOrChatPendingAction}
-                                        isOffline={network.isOffline}
                                         reportActions={reportActions}
                                         report={report}
                                         isComposerFullSize={isComposerFullSize}
                                         onSubmitComment={onSubmitComment}
                                         policies={policies}
                                     />
-                                </>
-                            )}
-
-                            {!isReportReadyForDisplay && (
-                                <ReportFooter
-                                    shouldDisableCompose
-                                    isOffline={network.isOffline}
-                                />
-                            )}
-                        </View>
-                    </DragAndDropProvider>
-                </FullPageNotFoundView>
-            </ScreenWrapper>
-        </ReportScreenContext.Provider>
+                                ) : (
+                                    <ReportFooter shouldDisableCompose />
+                                )}
+                            </View>
+                        </DragAndDropProvider>
+                    </FullPageNotFoundView>
+                </ScreenWrapper>
+            </ReactionListContext.Provider>
+        </ActionListContext.Provider>
     );
 }
 
@@ -397,36 +468,51 @@ ReportScreen.displayName = 'ReportScreen';
 
 export default compose(
     withViewportOffsetTop,
-    withLocalize,
-    withWindowDimensions,
-    withNetwork(),
     withCurrentReportID,
-    withOnyx({
-        isSidebarLoaded: {
-            key: ONYXKEYS.IS_SIDEBAR_LOADED,
-        },
-        reportActions: {
-            key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getReportID(route)}`,
-            canEvict: false,
-            selector: ReportActionsUtils.getSortedReportActionsForDisplay,
+    withOnyx(
+        {
+            isSidebarLoaded: {
+                key: ONYXKEYS.IS_SIDEBAR_LOADED,
+            },
+            reportActions: {
+                key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getReportID(route)}`,
+                canEvict: false,
+                selector: ReportActionsUtils.getSortedReportActionsForDisplay,
+            },
+            report: {
+                key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${getReportID(route)}`,
+                allowStaleData: true,
+            },
+            reportMetadata: {
+                key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_METADATA}${getReportID(route)}`,
+                initialValue: {
+                    isLoadingReportActions: false,
+                    isLoadingMoreReportActions: false,
+                },
+            },
+            isComposerFullSize: {
+                key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_IS_COMPOSER_FULL_SIZE}${getReportID(route)}`,
+                initialValue: false,
+            },
+            betas: {
+                key: ONYXKEYS.BETAS,
+            },
+            policies: {
+                key: ONYXKEYS.COLLECTION.POLICY,
+                allowStaleData: true,
+            },
+            accountManagerReportID: {
+                key: ONYXKEYS.ACCOUNT_MANAGER_REPORT_ID,
+                initialValue: null,
+            },
+            personalDetails: {
+                key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+            },
+            userLeavingStatus: {
+                key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_USER_IS_LEAVING_ROOM}${getReportID(route)}`,
+                initialValue: false,
+            },
         },
-        report: {
-            key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${getReportID(route)}`,
-        },
-        isComposerFullSize: {
-            key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_IS_COMPOSER_FULL_SIZE}${getReportID(route)}`,
-        },
-        betas: {
-            key: ONYXKEYS.BETAS,
-        },
-        policies: {
-            key: ONYXKEYS.COLLECTION.POLICY,
-        },
-        accountManagerReportID: {
-            key: ONYXKEYS.ACCOUNT_MANAGER_REPORT_ID,
-        },
-        personalDetails: {
-            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-        },
-    }),
+        true,
+    ),
 )(ReportScreen);
diff --git a/src/pages/home/ReportScreenContext.js b/src/pages/home/ReportScreenContext.js
index 2f79d6ae9432..1e8d30cf7585 100644
--- a/src/pages/home/ReportScreenContext.js
+++ b/src/pages/home/ReportScreenContext.js
@@ -1,4 +1,6 @@
 import {createContext} from 'react';
 
-const ReportScreenContext = createContext();
-export default ReportScreenContext;
+const ActionListContext = createContext();
+const ReactionListContext = createContext();
+
+export {ActionListContext, ReactionListContext};
diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js
index 362ce23f72ba..91fe38784e9c 100755
--- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js
+++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js
@@ -1,7 +1,9 @@
-import React, {useState} from 'react';
+import React, {useRef, useMemo, useState, memo} from 'react';
 import {InteractionManager, View} from 'react-native';
+import lodashGet from 'lodash/get';
 import _ from 'underscore';
 import PropTypes from 'prop-types';
+import {withOnyx} from 'react-native-onyx';
 import getReportActionContextMenuStyles from '../../../../styles/getReportActionContextMenuStyles';
 import ContextMenuItem from '../../../../components/ContextMenuItem';
 import {propTypes as genericReportActionContextMenuPropTypes, defaultProps as GenericReportActionContextMenuDefaultProps} from './genericReportActionContextMenuPropTypes';
@@ -12,6 +14,11 @@ import withWindowDimensions, {windowDimensionsPropTypes} from '../../../../compo
 import {withBetas} from '../../../../components/OnyxProvider';
 import * as Session from '../../../../libs/actions/Session';
 import {hideContextMenu} from './ReportActionContextMenu';
+import ONYXKEYS from '../../../../ONYXKEYS';
+import CONST from '../../../../CONST';
+import useArrowKeyFocusManager from '../../../../hooks/useArrowKeyFocusManager';
+import useKeyboardShortcut from '../../../../hooks/useKeyboardShortcut';
+import useNetwork from '../../../../hooks/useNetwork';
 
 const propTypes = {
     /** String representing the context menu type [LINK, REPORT_ACTION] which controls context menu choices  */
@@ -42,12 +49,22 @@ const defaultProps = {
     ...GenericReportActionContextMenuDefaultProps,
 };
 function BaseReportActionContextMenu(props) {
+    const menuItemRefs = useRef({});
     const [shouldKeepOpen, setShouldKeepOpen] = useState(false);
     const wrapperStyle = getReportActionContextMenuStyles(props.isMini, props.isSmallScreenWidth);
+    const {isOffline} = useNetwork();
+
+    const reportAction = useMemo(() => {
+        if (_.isEmpty(props.reportActions) || props.reportActionID === '0') {
+            return {};
+        }
+        return props.reportActions[props.reportActionID] || {};
+    }, [props.reportActions, props.reportActionID]);
+
     const shouldShowFilter = (contextAction) =>
         contextAction.shouldShow(
             props.type,
-            props.reportAction,
+            reportAction,
             props.isArchivedRoom,
             props.betas,
             props.anchor,
@@ -55,8 +72,23 @@ function BaseReportActionContextMenu(props) {
             props.reportID,
             props.isPinnedChat,
             props.isUnreadChat,
+            isOffline,
         );
 
+    const shouldEnableArrowNavigation = !props.isMini && (props.isVisible || shouldKeepOpen);
+    const filteredContextMenuActions = _.filter(ContextMenuActions, shouldShowFilter);
+
+    // Context menu actions that are not rendered as menu items are excluded from arrow navigation
+    const nonMenuItemActionIndexes = _.map(filteredContextMenuActions, (contextAction, index) => (_.isFunction(contextAction.renderContent) ? index : undefined));
+    const disabledIndexes = _.filter(nonMenuItemActionIndexes, (index) => !_.isUndefined(index));
+
+    const [focusedIndex, setFocusedIndex] = useArrowKeyFocusManager({
+        initialFocusedIndex: -1,
+        disabledIndexes,
+        maxIndex: filteredContextMenuActions.length - 1,
+        isActive: shouldEnableArrowNavigation,
+    });
+
     /**
      * Checks if user is anonymous. If true and the action doesn't accept for anonymous user, hides the context menu and
      * shows the sign in modal. Else, executes the callback.
@@ -76,16 +108,34 @@ function BaseReportActionContextMenu(props) {
         }
     };
 
+    useKeyboardShortcut(
+        CONST.KEYBOARD_SHORTCUTS.ENTER,
+        (event) => {
+            if (!menuItemRefs.current[focusedIndex]) {
+                return;
+            }
+
+            // Ensures the event does not cause side-effects beyond the context menu, e.g. when an outside element is focused
+            if (event) {
+                event.stopPropagation();
+            }
+
+            menuItemRefs.current[focusedIndex].triggerPressAndUpdateSuccess();
+            setFocusedIndex(-1);
+        },
+        {isActive: shouldEnableArrowNavigation},
+    );
+
     return (
         (props.isVisible || shouldKeepOpen) && (
             <View
                 ref={props.contentRef}
                 style={wrapperStyle}
             >
-                {_.map(_.filter(ContextMenuActions, shouldShowFilter), (contextAction) => {
+                {_.map(filteredContextMenuActions, (contextAction, index) => {
                     const closePopup = !props.isMini;
                     const payload = {
-                        reportAction: props.reportAction,
+                        reportAction,
                         reportID: props.reportID,
                         draftMessage: props.draftMessage,
                         selection: props.selection,
@@ -105,8 +155,11 @@ function BaseReportActionContextMenu(props) {
 
                     return (
                         <ContextMenuItem
+                            ref={(ref) => {
+                                menuItemRefs.current[index] = ref;
+                            }}
                             icon={contextAction.icon}
-                            text={props.translate(contextAction.textTranslateKey, {action: props.reportAction})}
+                            text={props.translate(contextAction.textTranslateKey, {action: reportAction})}
                             successIcon={contextAction.successIcon}
                             successText={contextAction.successTextTranslateKey ? props.translate(contextAction.successTextTranslateKey) : undefined}
                             isMini={props.isMini}
@@ -114,6 +167,7 @@ function BaseReportActionContextMenu(props) {
                             onPress={() => interceptAnonymousUser(() => contextAction.onPress(closePopup, payload), contextAction.isAnonymousAction)}
                             description={contextAction.getDescription(props.selection, props.isSmallScreenWidth)}
                             isAnonymousAction={contextAction.isAnonymousAction}
+                            isFocused={focusedIndex === index}
                         />
                     );
                 })}
@@ -125,4 +179,25 @@ function BaseReportActionContextMenu(props) {
 BaseReportActionContextMenu.propTypes = propTypes;
 BaseReportActionContextMenu.defaultProps = defaultProps;
 
-export default compose(withLocalize, withBetas(), withWindowDimensions)(BaseReportActionContextMenu);
+export default compose(
+    withLocalize,
+    withBetas(),
+    withWindowDimensions,
+    withOnyx({
+        reportActions: {
+            key: ({originalReportID}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${originalReportID}`,
+            canEvict: false,
+        },
+    }),
+)(
+    memo(BaseReportActionContextMenu, (prevProps, nextProps) => {
+        const prevReportAction = lodashGet(prevProps.reportActions, prevProps.reportActionID, '');
+        const nextReportAction = lodashGet(nextProps.reportActions, nextProps.reportActionID, '');
+
+        // We only want to re-render when the report action that is attached to is changed
+        if (prevReportAction !== nextReportAction) {
+            return false;
+        }
+        return _.isEqual(_.omit(prevProps, 'reportActions'), _.omit(nextProps, 'reportActions'));
+    }),
+);
diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.js b/src/pages/home/report/ContextMenu/ContextMenuActions.js
index bac79e1863e5..157ae66dc918 100644
--- a/src/pages/home/report/ContextMenu/ContextMenuActions.js
+++ b/src/pages/home/report/ContextMenu/ContextMenuActions.js
@@ -10,7 +10,7 @@ import * as ReportUtils from '../../../../libs/ReportUtils';
 import * as ReportActionsUtils from '../../../../libs/ReportActionsUtils';
 import * as PersonalDetailsUtils from '../../../../libs/PersonalDetailsUtils';
 import ReportActionComposeFocusManager from '../../../../libs/ReportActionComposeFocusManager';
-import {hideContextMenu, showDeleteModal} from './ReportActionContextMenu';
+import {hideContextMenu, showDeleteModal, clearActiveReportAction} from './ReportActionContextMenu';
 import CONST from '../../../../CONST';
 import getAttachmentDetails from '../../../../libs/fileDownload/getAttachmentDetails';
 import fileDownload from '../../../../libs/fileDownload';
@@ -21,6 +21,7 @@ import QuickEmojiReactions from '../../../../components/Reactions/QuickEmojiReac
 import MiniQuickEmojiReactions from '../../../../components/Reactions/MiniQuickEmojiReactions';
 import Navigation from '../../../../libs/Navigation/Navigation';
 import ROUTES from '../../../../ROUTES';
+import * as Task from '../../../../libs/actions/Task';
 
 /**
  * Gets the HTML version of the message in an action.
@@ -94,10 +95,10 @@ export default [
         icon: Expensicons.Download,
         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);
+        shouldShow: (type, reportAction, isArchivedRoom, betas, anchor, isChronosReport, reportID, isPinnedChat, isUnreadChat, isOffline) => {
+            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) && !isOffline;
         },
         onPress: (closePopover, {reportAction}) => {
             const message = _.last(lodashGet(reportAction, 'message', [{}]));
@@ -175,21 +176,20 @@ export default [
         successTextTranslateKey: 'reportActionContextMenu.copied',
         successIcon: Expensicons.Checkmark,
         shouldShow: (type, reportAction) =>
-            type === CONTEXT_MENU_TYPES.REPORT_ACTION &&
-            !ReportUtils.isReportMessageAttachment(_.last(lodashGet(reportAction, ['message'], [{}]))) &&
-            !ReportActionsUtils.isMessageDeleted(reportAction),
+            type === CONTEXT_MENU_TYPES.REPORT_ACTION && !ReportActionsUtils.isReportActionAttachment(reportAction) && !ReportActionsUtils.isMessageDeleted(reportAction),
 
         // If return value is true, we switch the `text` and `icon` on
         // `ContextMenuItem` with `successText` and `successIcon` which will fallback to
         // the `text` and `icon`
         onPress: (closePopover, {reportAction, selection}) => {
             const isTaskAction = ReportActionsUtils.isTaskAction(reportAction);
+            const isCreateTaskAction = ReportActionsUtils.isCreatedTaskReportAction(reportAction);
             const isReportPreviewAction = ReportActionsUtils.isReportPreviewAction(reportAction);
             const message = _.last(lodashGet(reportAction, 'message', [{}]));
-            const originalMessage = _.get(reportAction, 'originalMessage', {});
-            const messageHtml = isTaskAction ? lodashGet(originalMessage, 'html', '') : lodashGet(message, 'html', '');
+            const reportID = lodashGet(reportAction, 'originalMessage.taskReportID', '').toString();
+            const messageHtml = isTaskAction || isCreateTaskAction ? Task.getTaskReportActionMessage(reportAction.actionName, reportID, isCreateTaskAction) : lodashGet(message, 'html', '');
 
-            const isAttachment = _.has(reportAction, 'isAttachment') ? reportAction.isAttachment : ReportUtils.isReportMessageAttachment(message);
+            const isAttachment = ReportActionsUtils.isReportActionAttachment(reportAction);
             if (!isAttachment) {
                 const content = selection || messageHtml;
                 if (isReportPreviewAction) {
@@ -199,6 +199,9 @@ export default [
                 } else if (ReportActionsUtils.isModifiedExpenseAction(reportAction)) {
                     const modifyExpenseMessage = ReportUtils.getModifiedExpenseMessage(reportAction);
                     Clipboard.setString(modifyExpenseMessage);
+                } else if (ReportActionsUtils.isMoneyRequestAction(reportAction)) {
+                    const displayMessage = ReportUtils.getIOUReportActionDisplayMessage(reportAction);
+                    Clipboard.setString(displayMessage);
                 } else if (content) {
                     const parser = new ExpensiMark();
                     if (!Clipboard.canSetHtml()) {
@@ -208,9 +211,8 @@ export default [
                         Clipboard.setHtml(content, plainText);
                     }
                 }
-            } else {
-                Clipboard.setString(messageHtml);
             }
+
             if (closePopover) {
                 hideContextMenu(true, ReportActionComposeFocusManager.focus);
             }
@@ -225,8 +227,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;
@@ -287,14 +288,14 @@ export default [
                     const thread = ReportUtils.buildTransactionThread(reportAction, reportID);
                     const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread.participantAccountIDs);
                     Report.openReport(thread.reportID, userLogins, thread, reportAction.reportActionID);
-                    Navigation.navigate(ROUTES.getReportRoute(thread.reportID));
+                    Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(thread.reportID));
                     return;
                 }
                 Report.openReport(childReportID);
-                Navigation.navigate(ROUTES.getReportRoute(childReportID));
+                Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(childReportID));
                 return;
             }
-            const editAction = () => Report.saveReportActionDraft(reportID, reportAction.reportActionID, _.isEmpty(draftMessage) ? getActionText(reportAction) : '');
+            const editAction = () => Report.saveReportActionDraft(reportID, reportAction, _.isEmpty(draftMessage) ? getActionText(reportAction) : '');
 
             if (closePopover) {
                 // Hide popover, then call editAction
@@ -321,12 +322,12 @@ export default [
         onPress: (closePopover, {reportID, reportAction}) => {
             if (closePopover) {
                 // Hide popover, then call showDeleteConfirmModal
-                hideContextMenu(false, () => showDeleteModal(reportID, reportAction));
+                hideContextMenu(false, () => showDeleteModal(reportID, reportAction, true, clearActiveReportAction, clearActiveReportAction));
                 return;
             }
 
             // No popover to hide, call showDeleteConfirmModal immediately
-            showDeleteModal(reportID, reportAction);
+            showDeleteModal(reportID, reportAction, true, clearActiveReportAction, clearActiveReportAction);
         },
         getDescription: () => {},
     },
@@ -371,10 +372,10 @@ export default [
             reportAction.actorAccountID !== CONST.ACCOUNT_ID.CONCIERGE,
         onPress: (closePopover, {reportID, reportAction}) => {
             if (closePopover) {
-                hideContextMenu(false, () => Navigation.navigate(ROUTES.getFlagCommentRoute(reportID, reportAction.reportActionID)));
+                hideContextMenu(false, () => Navigation.navigate(ROUTES.FLAG_COMMENT.getRoute(reportID, reportAction.reportActionID)));
             }
 
-            Navigation.navigate(ROUTES.getFlagCommentRoute(reportID, reportAction.reportActionID));
+            Navigation.navigate(ROUTES.FLAG_COMMENT.getRoute(reportID, reportAction.reportActionID));
         },
         getDescription: () => {},
     },
diff --git a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js
index 81858564b416..7328f02adc5f 100644
--- a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js
+++ b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js
@@ -1,93 +1,59 @@
-import React from 'react';
+import React, {forwardRef, useEffect, useState, useRef, useImperativeHandle, useCallback} from 'react';
 import {Dimensions} from 'react-native';
 import _ from 'underscore';
-import lodashGet from 'lodash/get';
 import * as Report from '../../../../libs/actions/Report';
-import withLocalize, {withLocalizePropTypes} from '../../../../components/withLocalize';
 import PopoverWithMeasuredContent from '../../../../components/PopoverWithMeasuredContent';
 import BaseReportActionContextMenu from './BaseReportActionContextMenu';
 import ConfirmModal from '../../../../components/ConfirmModal';
-import CONST from '../../../../CONST';
 import * as ReportActionsUtils from '../../../../libs/ReportActionsUtils';
 import * as IOU from '../../../../libs/actions/IOU';
+import useLocalize from '../../../../hooks/useLocalize';
 
-const propTypes = {
-    ...withLocalizePropTypes,
-};
-
-class PopoverReportActionContextMenu extends React.Component {
-    constructor(props) {
-        super(props);
-
-        this.state = {
-            reportID: '0',
-            reportAction: {},
-            selection: '',
-            reportActionDraftMessage: '',
-            isPopoverVisible: false,
-            isDeleteCommentConfirmModalVisible: false,
-            shouldSetModalVisibilityForDeleteConfirmation: true,
-            cursorRelativePosition: {
-                horizontal: 0,
-                vertical: 0,
-            },
-
-            // The horizontal and vertical position (relative to the screen) where the popover will display.
-            popoverAnchorPosition: {
-                horizontal: 0,
-                vertical: 0,
-            },
-            isArchivedRoom: false,
-            isChronosReport: false,
-            isPinnedChat: false,
-            isUnreadChat: false,
-        };
-        this.onPopoverShow = () => {};
-        this.onPopoverHide = () => {};
-        this.onPopoverHideActionCallback = () => {};
-        this.contextMenuAnchor = undefined;
-        this.showContextMenu = this.showContextMenu.bind(this);
-        this.hideContextMenu = this.hideContextMenu.bind(this);
-        this.measureContextMenuAnchorPosition = this.measureContextMenuAnchorPosition.bind(this);
-        this.confirmDeleteAndHideModal = this.confirmDeleteAndHideModal.bind(this);
-        this.hideDeleteModal = this.hideDeleteModal.bind(this);
-        this.showDeleteModal = this.showDeleteModal.bind(this);
-        this.runAndResetOnPopoverShow = this.runAndResetOnPopoverShow.bind(this);
-        this.runAndResetOnPopoverHide = this.runAndResetOnPopoverHide.bind(this);
-        this.getContextMenuMeasuredLocation = this.getContextMenuMeasuredLocation.bind(this);
-        this.isActiveReportAction = this.isActiveReportAction.bind(this);
-
-        this.dimensionsEventListener = null;
-
-        this.contentRef = React.createRef();
-        this.setContentRef = (ref) => {
-            this.contentRef.current = ref;
-        };
-        this.setContentRef = this.setContentRef.bind(this);
-        this.anchorRef = React.createRef();
-    }
-
-    componentDidMount() {
-        this.dimensionsEventListener = Dimensions.addEventListener('change', this.measureContextMenuAnchorPosition);
-    }
-
-    shouldComponentUpdate(nextProps, nextState) {
-        const previousLocale = lodashGet(this.props, 'preferredLocale', CONST.LOCALES.DEFAULT);
-        const nextLocale = lodashGet(nextProps, 'preferredLocale', CONST.LOCALES.DEFAULT);
-        return (
-            this.state.isPopoverVisible !== nextState.isPopoverVisible ||
-            this.state.popoverAnchorPosition !== nextState.popoverAnchorPosition ||
-            this.state.isDeleteCommentConfirmModalVisible !== nextState.isDeleteCommentConfirmModalVisible ||
-            previousLocale !== nextLocale
-        );
-    }
-
-    componentWillUnmount() {
-        if (!this.dimensionsEventListener) {
-            return;
-        }
-        this.dimensionsEventListener.remove();
-    }
+function PopoverReportActionContextMenu(_props, ref) {
+    const {translate} = useLocalize();
+    const reportIDRef = useRef('0');
+    const typeRef = useRef('');
+    const reportActionRef = useRef({});
+    const reportActionIDRef = useRef('0');
+    const originalReportIDRef = useRef('0');
+    const selectionRef = useRef('');
+    const reportActionDraftMessageRef = useRef('');
+
+    const cursorRelativePosition = useRef({
+        horizontal: 0,
+        vertical: 0,
+    });
+
+    // The horizontal and vertical position (relative to the screen) where the popover will display.
+    const popoverAnchorPosition = useRef({
+        horizontal: 0,
+        vertical: 0,
+    });
+
+    const [instanceID, setInstanceID] = useState('');
+
+    const [isPopoverVisible, setIsPopoverVisible] = useState(false);
+    const [isDeleteCommentConfirmModalVisible, setIsDeleteCommentConfirmModalVisible] = useState(false);
+    const [shouldSetModalVisibilityForDeleteConfirmation, setShouldSetModalVisibilityForDeleteConfirmation] = useState(true);
+
+    const [isRoomArchived, setIsRoomArchived] = useState(false);
+    const [isChronosReportEnabled, setIsChronosReportEnabled] = useState(false);
+    const [isChatPinned, setIsChatPinned] = useState(false);
+    const [hasUnreadMessages, setHasUnreadMessages] = useState(false);
+
+    const contentRef = useRef(null);
+    const anchorRef = useRef(null);
+    const dimensionsEventListener = useRef(null);
+    const contextMenuAnchorRef = useRef(null);
+    const contextMenuTargetNode = useRef(null);
+
+    const onPopoverShow = useRef(() => {});
+    const onPopoverHide = useRef(() => {});
+    const onCancelDeleteModal = useRef(() => {});
+    const onComfirmDeleteModal = useRef(() => {});
+
+    const onPopoverHideActionCallback = useRef(() => {});
+    const callbackWhenDeleteModalHide = useRef(() => {});
 
     /**
      * Get the Context menu anchor position
@@ -95,15 +61,48 @@ class PopoverReportActionContextMenu extends React.Component {
      *
      * @returns {Promise<Object>}
      */
-    getContextMenuMeasuredLocation() {
-        return new Promise((resolve) => {
-            if (this.contextMenuAnchor) {
-                (this.contextMenuAnchor.current || this.contextMenuAnchor).measureInWindow((x, y) => resolve({x, y}));
-            } else {
-                resolve({x: 0, y: 0});
+    const getContextMenuMeasuredLocation = useCallback(
+        () =>
+            new Promise((resolve) => {
+                if (contextMenuAnchorRef.current && _.isFunction(contextMenuAnchorRef.current.measureInWindow)) {
+                    contextMenuAnchorRef.current.measureInWindow((x, y) => resolve({x, y}));
+                } else {
+                    resolve({x: 0, y: 0});
+                }
+            }),
+        [],
+    );
+
+    /**
+     * This gets called on Dimensions change to find the anchor coordinates for the action context menu.
+     */
+    const measureContextMenuAnchorPosition = useCallback(() => {
+        if (!isPopoverVisible) {
+            return;
+        }
+
+        getContextMenuMeasuredLocation().then(({x, y}) => {
+            if (!x || !y) {
+                return;
             }
+
+            popoverAnchorPosition.current = {
+                horizontal: cursorRelativePosition.horizontal + x,
+                vertical: cursorRelativePosition.vertical + y,
+            };
         });
-    }
+    }, [isPopoverVisible, getContextMenuMeasuredLocation]);
+
+    useEffect(() => {
+        dimensionsEventListener.current = Dimensions.addEventListener('change', measureContextMenuAnchorPosition);
+
+        return () => {
+            if (!dimensionsEventListener.current) {
+                return;
+            }
+            dimensionsEventListener.current.remove();
+        };
+    }, [measureContextMenuAnchorPosition]);
 
     /**
      * Whether Context Menu is active for the Report Action.
@@ -111,9 +110,12 @@ class PopoverReportActionContextMenu extends React.Component {
      * @param {Number|String} actionID
      * @return {Boolean}
      */
-    isActiveReportAction(actionID) {
-        return Boolean(actionID) && this.state.reportAction.reportActionID === actionID;
-    }
+    const isActiveReportAction = (actionID) => Boolean(actionID) && (reportActionIDRef.current === actionID || reportActionRef.current.reportActionID === actionID);
+
+    const clearActiveReportAction = () => {
+        reportActionIDRef.current = '0';
+        reportActionRef.current = {};
+    };
 
     /**
      * Show the ReportActionContextMenu modal popover.
@@ -123,7 +125,8 @@ class PopoverReportActionContextMenu extends React.Component {
      * @param {String} [selection] - Copied content.
      * @param {Element} contextMenuAnchor - popoverAnchor
      * @param {String} reportID - Active Report Id
-     * @param {Object} reportAction - ReportAction for ContextMenu
+     * @param {Object} reportActionID - ReportAction for ContextMenu
+     * @param {String} originalReportID - The currrent Report Id of the reportAction
      * @param {String} draftMessage - ReportAction Draftmessage
      * @param {Function} [onShow] - Run a callback when Menu is shown
      * @param {Function} [onHide] - Run a callback when Menu is hidden
@@ -132,13 +135,14 @@ class PopoverReportActionContextMenu extends React.Component {
      * @param {Boolean} isPinnedChat - Flag to check if the chat is pinned in the LHN. Used for the Pin/Unpin action
      * @param {Boolean} isUnreadChat - Flag to check if the chat is unread in the LHN. Used for the Mark as Read/Unread action
      */
-    showContextMenu(
+    const showContextMenu = (
         type,
         event,
         selection,
         contextMenuAnchor,
         reportID,
-        reportAction,
+        reportActionID,
+        originalReportID,
         draftMessage,
         onShow = () => {},
         onHide = () => {},
@@ -146,129 +150,105 @@ class PopoverReportActionContextMenu extends React.Component {
         isChronosReport = false,
         isPinnedChat = false,
         isUnreadChat = false,
-    ) {
+    ) => {
         const nativeEvent = event.nativeEvent || {};
-        this.contextMenuAnchor = contextMenuAnchor;
-        this.contextMenuTargetNode = nativeEvent.target;
-
-        // Singleton behaviour of ContextMenu creates race conditions when user requests multiple contextMenus.
-        // But it is possible that every new request registers new callbacks thus instanceID is used to corelate those callbacks
-        this.instanceID = Math.random().toString(36).substr(2, 5);
-
-        this.onPopoverShow = onShow;
-        this.onPopoverHide = onHide;
-
-        this.getContextMenuMeasuredLocation().then(({x, y}) => {
-            this.setState({
-                cursorRelativePosition: {
-                    horizontal: nativeEvent.pageX - x,
-                    vertical: nativeEvent.pageY - y,
-                },
-                popoverAnchorPosition: {
-                    horizontal: nativeEvent.pageX,
-                    vertical: nativeEvent.pageY,
-                },
-                type,
-                reportID,
-                reportAction,
-                selection,
-                isPopoverVisible: true,
-                reportActionDraftMessage: draftMessage,
-                isArchivedRoom,
-                isChronosReport,
-                isPinnedChat,
-                isUnreadChat,
-            });
-        });
-    }
+        contextMenuAnchorRef.current = contextMenuAnchor;
+        contextMenuTargetNode.current = nativeEvent.target;
 
-    /**
-     * This gets called on Dimensions change to find the anchor coordinates for the action context menu.
-     */
-    measureContextMenuAnchorPosition() {
-        if (!this.state.isPopoverVisible) {
-            return;
-        }
-        this.getContextMenuMeasuredLocation().then(({x, y}) => {
-            if (!x || !y) {
-                return;
-            }
-            this.setState((prev) => ({
-                popoverAnchorPosition: {
-                    horizontal: prev.cursorRelativePosition.horizontal + x,
-                    vertical: prev.cursorRelativePosition.vertical + y,
-                },
-            }));
+        setInstanceID(Math.random().toString(36).substr(2, 5));
+
+        onPopoverShow.current = onShow;
+        onPopoverHide.current = onHide;
+
+        getContextMenuMeasuredLocation().then(({x, y}) => {
+            popoverAnchorPosition.current = {
+                horizontal: nativeEvent.pageX - x,
+                vertical: nativeEvent.pageY - y,
+            };
+
+            popoverAnchorPosition.current = {
+                horizontal: nativeEvent.pageX,
+                vertical: nativeEvent.pageY,
+            };
+            typeRef.current = type;
+            reportIDRef.current = reportID;
+            reportActionIDRef.current = reportActionID;
+            originalReportIDRef.current = originalReportID;
+            selectionRef.current = selection;
+            setIsPopoverVisible(true);
+            reportActionDraftMessageRef.current = draftMessage;
+            setIsRoomArchived(isArchivedRoom);
+            setIsChronosReportEnabled(isChronosReport);
+            setIsChatPinned(isPinnedChat);
+            setHasUnreadMessages(isUnreadChat);
         });
-    }
+    };
 
     /**
      * After Popover shows, call the registered onPopoverShow callback and reset it
      */
-    runAndResetOnPopoverShow() {
-        this.onPopoverShow();
+    const runAndResetOnPopoverShow = () => {
+        onPopoverShow.current();
 
         // After we have called the action, reset it.
-        this.onPopoverShow = () => {};
-    }
+        onPopoverShow.current = () => {};
+    };
+
+    /**
+     * Run the callback and return a noop function to reset it
+     * @param {Function} callback
+     * @returns {Function}
+     */
+    const runAndResetCallback = (callback) => {
+        callback();
+        return () => {};
+    };
 
     /**
      * After Popover hides, call the registered onPopoverHide & onPopoverHideActionCallback callback and reset it
      */
-    runAndResetOnPopoverHide() {
-        this.setState({reportID: '0', reportAction: {}}, () => {
-            this.onPopoverHide = this.runAndResetCallback(this.onPopoverHide);
-            this.onPopoverHideActionCallback = this.runAndResetCallback(this.onPopoverHideActionCallback);
-        });
-    }
+    const runAndResetOnPopoverHide = () => {
+        reportIDRef.current = '0';
+        reportActionIDRef.current = '0';
+        originalReportIDRef.current = '0';
+
+        onPopoverHide.current = runAndResetCallback(onPopoverHide.current);
+        onPopoverHideActionCallback.current = runAndResetCallback(onPopoverHideActionCallback.current);
+    };
 
     /**
      * Hide the ReportActionContextMenu modal popover.
      * @param {Function} onHideActionCallback Callback to be called after popover is completely hidden
      */
-    hideContextMenu(onHideActionCallback) {
+    const hideContextMenu = (onHideActionCallback) => {
         if (_.isFunction(onHideActionCallback)) {
-            this.onPopoverHideActionCallback = onHideActionCallback;
+            onPopoverHideActionCallback.current = onHideActionCallback;
         }
-        this.setState({
-            selection: '',
-            reportActionDraftMessage: '',
-            isPopoverVisible: false,
-        });
-    }
 
-    /**
-     * Run the callback and return a noop function to reset it
-     * @param {Function} callback
-     * @returns {Function}
-     */
-    runAndResetCallback(callback) {
-        callback();
-        return () => {};
-    }
-
-    confirmDeleteAndHideModal() {
-        this.callbackWhenDeleteModalHide = () => (this.onComfirmDeleteModal = this.runAndResetCallback(this.onComfirmDeleteModal));
+        selectionRef.current = '';
+        reportActionDraftMessageRef.current = '';
+        setIsPopoverVisible(false);
+    };
 
-        if (ReportActionsUtils.isMoneyRequestAction(this.state.reportAction)) {
-            IOU.deleteMoneyRequest(this.state.reportAction.originalMessage.IOUTransactionID, this.state.reportAction);
+    const confirmDeleteAndHideModal = useCallback(() => {
+        callbackWhenDeleteModalHide.current = () => (onComfirmDeleteModal.current = runAndResetCallback(onComfirmDeleteModal.current));
+        if (ReportActionsUtils.isMoneyRequestAction(reportActionRef.current)) {
+            IOU.deleteMoneyRequest(reportActionRef.current.originalMessage.IOUTransactionID, reportActionRef.current);
         } else {
-            Report.deleteReportComment(this.state.reportID, this.state.reportAction);
+            Report.deleteReportComment(reportIDRef.current, reportActionRef.current);
         }
-        this.setState({isDeleteCommentConfirmModalVisible: false});
-    }
-
-    hideDeleteModal() {
-        this.callbackWhenDeleteModalHide = () => (this.onCancelDeleteModal = this.runAndResetCallback(this.onCancelDeleteModal));
-        this.setState({
-            isDeleteCommentConfirmModalVisible: false,
-            shouldSetModalVisibilityForDeleteConfirmation: true,
-            isArchivedRoom: false,
-            isChronosReport: false,
-            isPinnedChat: false,
-            isUnreadChat: false,
-        });
-    }
+        setIsDeleteCommentConfirmModalVisible(false);
+    }, [reportActionRef]);
+
+    const hideDeleteModal = () => {
+        callbackWhenDeleteModalHide.current = () => (onCancelDeleteModal.current = runAndResetCallback(onCancelDeleteModal.current));
+        setIsDeleteCommentConfirmModalVisible(false);
+        setShouldSetModalVisibilityForDeleteConfirmation(true);
+        setIsRoomArchived(false);
+        setIsChronosReportEnabled(false);
+        setIsChatPinned(false);
+        setHasUnreadMessages(false);
+    };
 
     /**
      * Opens the Confirm delete action modal
@@ -278,69 +258,80 @@ class PopoverReportActionContextMenu extends React.Component {
      * @param {Function} [onConfirm]
      * @param {Function} [onCancel]
      */
-    showDeleteModal(reportID, reportAction, shouldSetModalVisibility = true, onConfirm = () => {}, onCancel = () => {}) {
-        this.onCancelDeleteModal = onCancel;
-        this.onComfirmDeleteModal = onConfirm;
-        this.setState({
-            reportID,
-            reportAction,
-            shouldSetModalVisibilityForDeleteConfirmation: shouldSetModalVisibility,
-            isDeleteCommentConfirmModalVisible: true,
-        });
-    }
-
-    render() {
-        return (
-            <>
-                <PopoverWithMeasuredContent
-                    isVisible={this.state.isPopoverVisible}
-                    onClose={this.hideContextMenu}
-                    onModalShow={this.runAndResetOnPopoverShow}
-                    onModalHide={this.runAndResetOnPopoverHide}
-                    anchorPosition={this.state.popoverAnchorPosition}
-                    animationIn="fadeIn"
-                    disableAnimation={false}
-                    animationOutTiming={1}
-                    shouldSetModalVisibility={false}
-                    fullscreen
-                    withoutOverlay
-                    anchorRef={this.anchorRef}
-                >
-                    <BaseReportActionContextMenu
-                        isVisible
-                        type={this.state.type}
-                        reportID={this.state.reportID}
-                        reportAction={this.state.reportAction}
-                        draftMessage={this.state.reportActionDraftMessage}
-                        selection={this.state.selection}
-                        isArchivedRoom={this.state.isArchivedRoom}
-                        isChronosReport={this.state.isChronosReport}
-                        isPinnedChat={this.state.isPinnedChat}
-                        isUnreadChat={this.state.isUnreadChat}
-                        anchor={this.contextMenuTargetNode}
-                        contentRef={this.contentRef}
-                    />
-                </PopoverWithMeasuredContent>
-                <ConfirmModal
-                    title={this.props.translate('reportActionContextMenu.deleteAction', {action: this.state.reportAction})}
-                    isVisible={this.state.isDeleteCommentConfirmModalVisible}
-                    shouldSetModalVisibility={this.state.shouldSetModalVisibilityForDeleteConfirmation}
-                    onConfirm={this.confirmDeleteAndHideModal}
-                    onCancel={this.hideDeleteModal}
-                    onModalHide={() => {
-                        this.setState({reportID: '0', reportAction: {}});
-                        this.callbackWhenDeleteModalHide();
-                    }}
-                    prompt={this.props.translate('reportActionContextMenu.deleteConfirmation', {action: this.state.reportAction})}
-                    confirmText={this.props.translate('common.delete')}
-                    cancelText={this.props.translate('common.cancel')}
-                    danger
+    const showDeleteModal = (reportID, reportAction, shouldSetModalVisibility = true, onConfirm = () => {}, onCancel = () => {}) => {
+        onCancelDeleteModal.current = onCancel;
+        onComfirmDeleteModal.current = onConfirm;
+
+        reportIDRef.current = reportID;
+        reportActionRef.current = reportAction;
+
+        setShouldSetModalVisibilityForDeleteConfirmation(shouldSetModalVisibility);
+        setIsDeleteCommentConfirmModalVisible(true);
+    };
+
+    useImperativeHandle(ref, () => ({
+        showContextMenu,
+        hideContextMenu,
+        showDeleteModal,
+        hideDeleteModal,
+        isActiveReportAction,
+        instanceID,
+        runAndResetOnPopoverHide,
+        clearActiveReportAction,
+    }));
+
+    const reportAction = reportActionRef.current;
+
+    return (
+        <>
+            <PopoverWithMeasuredContent
+                isVisible={isPopoverVisible}
+                onClose={hideContextMenu}
+                onModalShow={runAndResetOnPopoverShow}
+                onModalHide={runAndResetOnPopoverHide}
+                anchorPosition={popoverAnchorPosition.current}
+                animationIn="fadeIn"
+                disableAnimation={false}
+                animationOutTiming={1}
+                shouldSetModalVisibility={false}
+                fullscreen
+                withoutOverlay
+                anchorRef={anchorRef}
+            >
+                <BaseReportActionContextMenu
+                    isVisible
+                    type={typeRef.current}
+                    reportID={reportIDRef.current}
+                    reportActionID={reportActionIDRef.current}
+                    draftMessage={reportActionDraftMessageRef.current}
+                    selection={selectionRef.current}
+                    isArchivedRoom={isRoomArchived}
+                    isChronosReport={isChronosReportEnabled}
+                    isPinnedChat={isChatPinned}
+                    isUnreadChat={hasUnreadMessages}
+                    anchor={contextMenuTargetNode}
+                    contentRef={contentRef}
+                    originalReportID={originalReportIDRef.current}
                 />
-            </>
-        );
-    }
+            </PopoverWithMeasuredContent>
+            <ConfirmModal
+                title={translate('reportActionContextMenu.deleteAction', {reportAction})}
+                isVisible={isDeleteCommentConfirmModalVisible}
+                shouldSetModalVisibility={shouldSetModalVisibilityForDeleteConfirmation}
+                onConfirm={confirmDeleteAndHideModal}
+                onCancel={hideDeleteModal}
+                onModalHide={() => {
+                    callbackWhenDeleteModalHide.current();
+                }}
+                prompt={translate('reportActionContextMenu.deleteConfirmation', {action: reportAction})}
+                confirmText={translate('common.delete')}
+                cancelText={translate('common.cancel')}
+                danger
+            />
+        </>
+    );
 }
 
-PopoverReportActionContextMenu.propTypes = propTypes;
+PopoverReportActionContextMenu.displayName = 'PopoverReportActionContextMenu';
 
-export default withLocalize(PopoverReportActionContextMenu);
+export default forwardRef(PopoverReportActionContextMenu);
diff --git a/src/pages/home/report/ContextMenu/ReportActionContextMenu.js b/src/pages/home/report/ContextMenu/ReportActionContextMenu.js
index de495e3b9d1d..9467ff19b2f5 100644
--- a/src/pages/home/report/ContextMenu/ReportActionContextMenu.js
+++ b/src/pages/home/report/ContextMenu/ReportActionContextMenu.js
@@ -39,7 +39,8 @@ function hideContextMenu(shouldDelay, onHideCallback = () => {}) {
  * @param {String} [selection] - Copied content.
  * @param {Element} contextMenuAnchor - popoverAnchor
  * @param {String} reportID - Active Report Id
- * @param {Object} reportAction - ReportAction for ContextMenu
+ * @param {String} reportActionID - ReportActionID for ContextMenu
+ * @param {String} originalReportID - The currrent Report Id of the reportAction
  * @param {String} draftMessage - ReportAction Draftmessage
  * @param {Function} [onShow=() => {}] - Run a callback when Menu is shown
  * @param {Function} [onHide=() => {}] - Run a callback when Menu is hidden
@@ -54,7 +55,8 @@ function showContextMenu(
     selection,
     contextMenuAnchor,
     reportID = '0',
-    reportAction = {},
+    reportActionID = '0',
+    originalReportID = '0',
     draftMessage = '',
     onShow = () => {},
     onHide = () => {},
@@ -72,13 +74,15 @@ function showContextMenu(
         hideContextMenu();
         contextMenuRef.current.runAndResetOnPopoverHide();
     }
+
     contextMenuRef.current.showContextMenu(
         type,
         event,
         selection,
         contextMenuAnchor,
         reportID,
-        reportAction,
+        reportActionID,
+        originalReportID,
         draftMessage,
         onShow,
         onHide,
@@ -124,4 +128,11 @@ function isActiveReportAction(actionID) {
     return contextMenuRef.current.isActiveReportAction(actionID);
 }
 
-export {contextMenuRef, showContextMenu, hideContextMenu, isActiveReportAction, showDeleteModal, hideDeleteModal};
+function clearActiveReportAction() {
+    if (!contextMenuRef.current) {
+        return;
+    }
+    return contextMenuRef.current.clearActiveReportAction();
+}
+
+export {contextMenuRef, showContextMenu, hideContextMenu, isActiveReportAction, clearActiveReportAction, showDeleteModal, hideDeleteModal};
diff --git a/src/pages/home/report/ContextMenu/genericReportActionContextMenuPropTypes.js b/src/pages/home/report/ContextMenu/genericReportActionContextMenuPropTypes.js
index f62873031c54..3d8667e44e62 100644
--- a/src/pages/home/report/ContextMenu/genericReportActionContextMenuPropTypes.js
+++ b/src/pages/home/report/ContextMenu/genericReportActionContextMenuPropTypes.js
@@ -1,12 +1,14 @@
 import PropTypes from 'prop-types';
-import reportActionPropTypes from '../reportActionPropTypes';
 
 const propTypes = {
     /** The ID of the report this report action is attached to. */
     reportID: PropTypes.string.isRequired,
 
-    /** The report action this context menu is attached to. */
-    reportAction: PropTypes.shape(reportActionPropTypes).isRequired,
+    /** The ID of the report action this context menu is attached to. */
+    reportActionID: PropTypes.string.isRequired,
+
+    /** The ID of the original report from which the given reportAction is first created. */
+    originalReportID: PropTypes.string.isRequired,
 
     /** If true, this component will be a small, row-oriented menu that displays icons but not text.
     If false, this component will be a larger, column-oriented menu that displays icons alongside text in each row. */
diff --git a/src/pages/home/report/FloatingMessageCounter/index.js b/src/pages/home/report/FloatingMessageCounter/index.js
index 73fe02df129b..a4e2d25d9490 100644
--- a/src/pages/home/report/FloatingMessageCounter/index.js
+++ b/src/pages/home/report/FloatingMessageCounter/index.js
@@ -1,6 +1,7 @@
 import React, {useEffect, useMemo, useCallback} from 'react';
 import {Animated, View} from 'react-native';
 import PropTypes from 'prop-types';
+import CONST from '../../../../CONST';
 import styles from '../../../../styles/styles';
 import Button from '../../../../components/Button';
 import Text from '../../../../components/Text';
@@ -9,6 +10,7 @@ import * as Expensicons from '../../../../components/Icon/Expensicons';
 import themeColors from '../../../../styles/themes/default';
 import useLocalize from '../../../../hooks/useLocalize';
 import FloatingMessageCounterContainer from './FloatingMessageCounterContainer';
+import useNativeDriver from '../../../../libs/useNativeDriver';
 
 const propTypes = {
     /** Whether the New Messages indicator is active */
@@ -34,7 +36,7 @@ function FloatingMessageCounter(props) {
         Animated.spring(translateY, {
             toValue: MARKER_ACTIVE_TRANSLATE_Y,
             duration: 80,
-            useNativeDriver: true,
+            useNativeDriver,
         }).start();
     }, [translateY]);
 
@@ -42,7 +44,7 @@ function FloatingMessageCounter(props) {
         Animated.spring(translateY, {
             toValue: MARKER_INACTIVE_TRANSLATE_Y,
             duration: 80,
-            useNativeDriver: true,
+            useNativeDriver,
         }).start();
     }, [translateY]);
 
@@ -75,6 +77,7 @@ function FloatingMessageCounter(props) {
                             <Text
                                 selectable={false}
                                 style={[styles.ml2, styles.buttonSmallText, styles.textWhite]}
+                                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                             >
                                 {translate('newMessages')}
                             </Text>
diff --git a/src/pages/home/report/LinkPreviewer.js b/src/pages/home/report/LinkPreviewer.js
index 7c88e9d54126..4fcbb0dc0569 100644
--- a/src/pages/home/report/LinkPreviewer.js
+++ b/src/pages/home/report/LinkPreviewer.js
@@ -8,7 +8,7 @@ import TextLink from '../../../components/TextLink';
 import * as StyleUtils from '../../../styles/StyleUtils';
 import styles from '../../../styles/styles';
 import variables from '../../../styles/variables';
-import colors from '../../../styles/colors';
+import themeColors from '../../../styles/themes/default';
 
 const IMAGE_TYPES = ['jpg', 'jpeg', 'png'];
 const MAX_IMAGE_HEIGHT = 180;
@@ -99,7 +99,7 @@ function LinkPreviewer(props) {
                         {!_.isEmpty(title) && (
                             <TextLink
                                 fontSize={variables.fontSizeNormal}
-                                style={[styles.mv2, StyleUtils.getTextColorStyle(colors.blueLinkPreview), styles.alignSelfStart]}
+                                style={[styles.mv2, StyleUtils.getTextColorStyle(themeColors.link), styles.alignSelfStart]}
                                 href={url}
                             >
                                 {title}
diff --git a/src/pages/home/report/ReactionList/BaseReactionList.js b/src/pages/home/report/ReactionList/BaseReactionList.js
index 0b77fca7c645..b082ca510edd 100755
--- a/src/pages/home/report/ReactionList/BaseReactionList.js
+++ b/src/pages/home/report/ReactionList/BaseReactionList.js
@@ -79,7 +79,7 @@ function BaseReactionList(props) {
             hoverStyle={styles.hoveredComponentBG}
             onSelectRow={() => {
                 props.onClose();
-                Navigation.navigate(ROUTES.getProfileRoute(item.accountID));
+                Navigation.navigate(ROUTES.PROFILE.getRoute(item.accountID));
             }}
             option={{
                 text: Str.removeSMSDomain(item.displayName),
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 45882dc23a78..d04983dc2f75 100644
--- a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions.js
+++ b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions.js
@@ -33,6 +33,7 @@ import compose from '../../../../libs/compose';
 import withKeyboardState from '../../../../components/withKeyboardState';
 import {propTypes, defaultProps} from './composerWithSuggestionsProps';
 import focusWithDelay from '../../../../libs/focusWithDelay';
+import useDebounce from '../../../../hooks/useDebounce';
 
 const {RNTextInputReset} = NativeModules;
 
@@ -91,7 +92,6 @@ function ComposerWithSuggestions({
     setIsFullComposerAvailable,
     setIsCommentEmpty,
     submitForm,
-    shouldShowReportRecipientLocalTime,
     shouldShowComposeInput,
     measureParentContainer,
     // Refs
@@ -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;
@@ -127,6 +126,9 @@ function ComposerWithSuggestions({
     const textInputRef = useRef(null);
     const insertedEmojisRef = useRef([]);
 
+    // A flag to indicate whether the onScroll callback is likely triggered by a layout change (caused by text change) or not
+    const isScrollLikelyLayoutTriggered = useRef(false);
+
     /**
      * Update frequently used emojis list. We debounce this method in the constructor so that UpdateFrequentlyUsedEmojis
      * API is not called too often.
@@ -136,6 +138,23 @@ function ComposerWithSuggestions({
         insertedEmojisRef.current = [];
     }, []);
 
+    /**
+     * Reset isScrollLikelyLayoutTriggered to false.
+     *
+     * The function is debounced with a handpicked wait time to address 2 issues:
+     * 1. There is a slight delay between onChangeText and onScroll
+     * 2. Layout change will trigger onScroll multiple times
+     */
+    const debouncedLowerIsScrollLikelyLayoutTriggered = useDebounce(
+        useCallback(() => (isScrollLikelyLayoutTriggered.current = false), []),
+        500,
+    );
+
+    const raiseIsScrollLikelyLayoutTriggered = useCallback(() => {
+        isScrollLikelyLayoutTriggered.current = true;
+        debouncedLowerIsScrollLikelyLayoutTriggered();
+    }, [debouncedLowerIsScrollLikelyLayoutTriggered]);
+
     const onInsertedEmoji = useCallback(
         (emojiObject) => {
             insertedEmojisRef.current = [...insertedEmojisRef.current, emojiObject];
@@ -176,6 +195,7 @@ function ComposerWithSuggestions({
      */
     const updateComment = useCallback(
         (commentValue, shouldDebounceSaveComment) => {
+            raiseIsScrollLikelyLayoutTriggered();
             const {text: newComment, emojis} = EmojiUtils.replaceAndExtractEmojis(commentValue, preferredSkinTone, preferredLocale);
 
             if (!_.isEmpty(emojis)) {
@@ -186,7 +206,12 @@ function ComposerWithSuggestions({
             setIsCommentEmpty(!!newComment.match(/^(\s)*$/));
             setValue(newComment);
             if (commentValue !== newComment) {
-                const remainder = ComposerUtils.getCommonSuffixLength(commentRef.current, newComment);
+                // Ensure emoji suggestions are hidden even when the selection is not changed (so calculateEmojiSuggestion would not be called).
+                if (suggestionsRef.current) {
+                    suggestionsRef.current.resetSuggestions();
+                }
+
+                const remainder = ComposerUtils.getCommonSuffixLength(commentValue, newComment);
                 setSelection({
                     start: newComment.length - remainder,
                     end: newComment.length - remainder,
@@ -213,7 +238,7 @@ function ComposerWithSuggestions({
                 debouncedBroadcastUserIsTyping(reportID);
             }
         },
-        [debouncedUpdateFrequentlyUsedEmojis, preferredLocale, preferredSkinTone, reportID, setIsCommentEmpty],
+        [debouncedUpdateFrequentlyUsedEmojis, preferredLocale, preferredSkinTone, reportID, setIsCommentEmpty, suggestionsRef, raiseIsScrollLikelyLayoutTriggered],
     );
 
     /**
@@ -242,6 +267,11 @@ function ComposerWithSuggestions({
             return '';
         }
 
+        // Since we're submitting the form here which should clear the composer
+        // We don't really care about saving the draft the user was typing
+        // We need to make sure an empty draft gets saved instead
+        debouncedSaveReportComment.cancel();
+
         updateComment('');
         setTextInputShouldClear(true);
         if (isComposerFullSize) {
@@ -297,7 +327,7 @@ function ComposerWithSuggestions({
                     (action) => ReportUtils.canEditReportAction(action) && !ReportActionsUtils.isMoneyRequestAction(action),
                 );
                 if (lastReportAction) {
-                    Report.saveReportActionDraft(reportID, lastReportAction.reportActionID, _.last(lastReportAction.message).html);
+                    Report.saveReportActionDraft(reportID, lastReportAction, _.last(lastReportAction.message).html);
                 }
             }
         },
@@ -306,7 +336,7 @@ function ComposerWithSuggestions({
 
     const onSelectionChange = useCallback(
         (e) => {
-            if (suggestionsRef.current.onSelectionChange(e)) {
+            if (textInputRef.current && textInputRef.current.isFocused() && suggestionsRef.current.onSelectionChange(e)) {
                 return;
             }
 
@@ -315,18 +345,18 @@ function ComposerWithSuggestions({
         [suggestionsRef],
     );
 
-    const updateShouldShowSuggestionMenuToFalse = useCallback(() => {
-        if (!suggestionsRef.current) {
+    const hideSuggestionMenu = useCallback(() => {
+        if (!suggestionsRef.current || isScrollLikelyLayoutTriggered.current) {
             return;
         }
         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]);
 
     /**
@@ -354,9 +384,10 @@ function ComposerWithSuggestions({
      * @returns {Boolean}
      */
     const checkComposerVisibility = useCallback(() => {
-        const isComposerCoveredUp = EmojiPickerActions.isEmojiPickerVisible() || isMenuVisible || modal.isVisible;
+        // Checking whether the screen is focused or not, helps avoid `modal.isVisible` false when popups are closed, even if the modal is opened.
+        const isComposerCoveredUp = !isFocused || EmojiPickerActions.isEmojiPickerVisible() || isMenuVisible || modal.isVisible || modal.willAlertModalBecomeVisible;
         return !isComposerCoveredUp;
-    }, [isMenuVisible, modal.isVisible]);
+    }, [isMenuVisible, modal, isFocused]);
 
     const focusComposerOnKeyPress = useCallback(
         (e) => {
@@ -472,7 +503,7 @@ function ComposerWithSuggestions({
                     maxLines={maxComposerLines}
                     onFocus={onFocus}
                     onBlur={onBlur}
-                    onClick={setShouldBlockSuggestionCalc}
+                    onClick={setShouldBlockSuggestionCalcToFalse}
                     onPasteFile={displayFileInModal}
                     shouldClear={textInputShouldClear}
                     onClear={() => setTextInputShouldClear(false)}
@@ -494,7 +525,7 @@ function ComposerWithSuggestions({
                         }
                         setComposerHeight(composerLayoutHeight);
                     }}
-                    onScroll={updateShouldShowSuggestionMenuToFalse}
+                    onScroll={hideSuggestionMenu}
                 />
             </View>
 
@@ -503,7 +534,6 @@ function ComposerWithSuggestions({
                 isComposerFullSize={isComposerFullSize}
                 updateComment={updateComment}
                 composerHeight={composerHeight}
-                shouldShowReportRecipientLocalTime={shouldShowReportRecipientLocalTime}
                 onInsertedEmoji={onInsertedEmoji}
                 measureParentContainer={measureParentContainer}
                 // Input
diff --git a/src/pages/home/report/ReportActionCompose/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose/ReportActionCompose.js
index 3ad92fa5c769..46153bda15e6 100644
--- a/src/pages/home/report/ReportActionCompose/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose/ReportActionCompose.js
@@ -5,6 +5,7 @@ import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import {withOnyx} from 'react-native-onyx';
 import {useAnimatedRef} from 'react-native-reanimated';
+import {PortalHost} from '@gorhom/portal';
 import styles from '../../../../styles/styles';
 import ONYXKEYS from '../../../../ONYXKEYS';
 import * as Report from '../../../../libs/actions/Report';
@@ -30,12 +31,12 @@ import OfflineWithFeedback from '../../../../components/OfflineWithFeedback';
 import SendButton from './SendButton';
 import AttachmentPickerWithMenuItems from './AttachmentPickerWithMenuItems';
 import ComposerWithSuggestions from './ComposerWithSuggestions';
-import debouncedSaveReportComment from '../../../../libs/ComposerUtils/debouncedSaveReportComment';
 import reportActionPropTypes from '../reportActionPropTypes';
 import useLocalize from '../../../../hooks/useLocalize';
 import getModalState from '../../../../libs/getModalState';
 import useWindowDimensions from '../../../../hooks/useWindowDimensions';
 import * as EmojiPickerActions from '../../../../libs/actions/EmojiPickerAction';
+import getDraftComment from '../../../../libs/ComposerUtils/getDraftComment';
 
 const propTypes = {
     /** A method to call when the form is submitted */
@@ -75,7 +76,6 @@ const propTypes = {
 };
 
 const defaultProps = {
-    modal: {},
     report: {},
     blockedFromConcierge: {},
     personalDetails: {},
@@ -105,7 +105,6 @@ function ReportActionCompose({
     reportID,
     reportActions,
     shouldShowComposeInput,
-    isCommentEmpty: isCommentEmptyProp,
 }) {
     const {translate} = useLocalize();
     const {isMediumScreenWidth, isSmallScreenWidth} = useWindowDimensions();
@@ -125,7 +124,10 @@ function ReportActionCompose({
      * Updates the should clear state of the composer
      */
     const [textInputShouldClear, setTextInputShouldClear] = useState(false);
-    const [isCommentEmpty, setIsCommentEmpty] = useState(isCommentEmptyProp);
+    const [isCommentEmpty, setIsCommentEmpty] = useState(() => {
+        const draftComment = getDraftComment(reportID);
+        return !draftComment || !!draftComment.match(/^(\s)*$/);
+    });
 
     /**
      * Updates the visibility state of the menu
@@ -205,6 +207,10 @@ function ReportActionCompose({
         composerRef.current.blur();
     }, []);
 
+    const onItemSelected = useCallback(() => {
+        isKeyboardVisibleWhenShowingModalRef.current = false;
+    }, []);
+
     const updateShouldShowSuggestionMenuToFalse = useCallback(() => {
         if (!suggestionsRef.current) {
             return;
@@ -217,10 +223,6 @@ function ReportActionCompose({
      */
     const addAttachment = useCallback(
         (file) => {
-            // Since we're submitting the form here which should clear the composer
-            // We don't really care about saving the draft the user was typing
-            // We need to make sure an empty draft gets saved instead
-            debouncedSaveReportComment.cancel();
             const newComment = composerRef.current.prepareCommentAndResetComposer();
             Report.addAttachment(reportID, file, newComment);
             setTextInputShouldClear(false);
@@ -248,11 +250,6 @@ function ReportActionCompose({
                 e.preventDefault();
             }
 
-            // Since we're submitting the form here which should clear the composer
-            // We don't really care about saving the draft the user was typing
-            // We need to make sure an empty draft gets saved instead
-            debouncedSaveReportComment.cancel();
-
             const newComment = composerRef.current.prepareCommentAndResetComposer();
             if (!newComment) {
                 return;
@@ -271,11 +268,14 @@ function ReportActionCompose({
             suggestionsRef.current.setShouldBlockSuggestionCalc(true);
         }
         isNextModalWillOpenRef.current = true;
+        isKeyboardVisibleWhenShowingModalRef.current = true;
     }, []);
 
     const onBlur = useCallback((e) => {
         setIsFocused(false);
-        suggestionsRef.current.resetSuggestions();
+        if (suggestionsRef.current) {
+            suggestionsRef.current.resetSuggestions();
+        }
         if (e.relatedTarget && e.relatedTarget === actionButtonRef.current) {
             isKeyboardVisibleWhenShowingModalRef.current = true;
         }
@@ -319,6 +319,7 @@ function ReportActionCompose({
             ref={containerRef}
             style={[shouldShowReportRecipientLocalTime && !lodashGet(network, 'isOffline') && styles.chatItemComposeWithFirstRow, isComposerFullSize && styles.chatItemFullComposeRow]}
         >
+            <PortalHost name="suggestions" />
             <OfflineWithFeedback
                 pendingAction={pendingAction}
                 style={isComposerFullSize ? styles.chatItemFullComposeRow : {}}
@@ -358,6 +359,7 @@ function ReportActionCompose({
                                     onCanceledAttachmentPicker={restoreKeyboardState}
                                     onMenuClosed={restoreKeyboardState}
                                     onAddActionPressed={onAddActionPressed}
+                                    onItemSelected={onItemSelected}
                                     actionButtonRef={actionButtonRef}
                                 />
                                 <ComposerWithSuggestions
@@ -380,7 +382,6 @@ function ReportActionCompose({
                                     setIsFullComposerAvailable={setIsFullComposerAvailable}
                                     setIsCommentEmpty={setIsCommentEmpty}
                                     submitForm={submitForm}
-                                    shouldShowReportRecipientLocalTime={shouldShowReportRecipientLocalTime}
                                     shouldShowComposeInput={shouldShowComposeInput}
                                     onFocus={onFocus}
                                     onBlur={onBlur}
@@ -441,10 +442,6 @@ export default compose(
     withNetwork(),
     withCurrentUserPersonalDetails,
     withOnyx({
-        isCommentEmpty: {
-            key: ({reportID}) => `${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`,
-            selector: (comment) => _.isEmpty(comment),
-        },
         blockedFromConcierge: {
             key: ONYXKEYS.NVP_BLOCKED_FROM_CONCIERGE,
         },
diff --git a/src/pages/home/report/ReportActionCompose/SilentCommentUpdater.js b/src/pages/home/report/ReportActionCompose/SilentCommentUpdater.js
index da5dc326d421..09f9d368bdcc 100644
--- a/src/pages/home/report/ReportActionCompose/SilentCommentUpdater.js
+++ b/src/pages/home/report/ReportActionCompose/SilentCommentUpdater.js
@@ -68,5 +68,6 @@ SilentCommentUpdater.displayName = 'SilentCommentUpdater';
 export default withOnyx({
     comment: {
         key: ({reportID}) => `${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`,
+        initialValue: '',
     },
 })(SilentCommentUpdater);
diff --git a/src/pages/home/report/ReportActionCompose/SuggestionEmoji.js b/src/pages/home/report/ReportActionCompose/SuggestionEmoji.js
index 687570af12e6..910a338c83b6 100644
--- a/src/pages/home/report/ReportActionCompose/SuggestionEmoji.js
+++ b/src/pages/home/report/ReportActionCompose/SuggestionEmoji.js
@@ -42,12 +42,6 @@ const propTypes = {
     /** Callback when a emoji was inserted */
     onInsertedEmoji: PropTypes.func.isRequired,
 
-    /** The current selection */
-    selection: PropTypes.shape({
-        start: PropTypes.number.isRequired,
-        end: PropTypes.number.isRequired,
-    }).isRequired,
-
     ...SuggestionProps.baseProps,
 };
 
@@ -64,7 +58,6 @@ function SuggestionEmoji({
     setSelection,
     updateComment,
     isComposerFullSize,
-    shouldShowReportRecipientLocalTime,
     isAutoSuggestionPickerLarge,
     forwardedRef,
     resetKeyboardInput,
@@ -241,7 +234,6 @@ function SuggestionEmoji({
             isComposerFullSize={isComposerFullSize}
             preferredSkinToneIndex={preferredSkinTone}
             isEmojiPickerLarge={isAutoSuggestionPickerLarge}
-            shouldIncludeReportRecipientLocalTimeHeight={shouldShowReportRecipientLocalTime}
             measureParentContainer={measureParentContainer}
         />
     );
diff --git a/src/pages/home/report/ReportActionCompose/SuggestionMention.js b/src/pages/home/report/ReportActionCompose/SuggestionMention.js
index 79b5d1d66e36..6c08b68cdc78 100644
--- a/src/pages/home/report/ReportActionCompose/SuggestionMention.js
+++ b/src/pages/home/report/ReportActionCompose/SuggestionMention.js
@@ -1,4 +1,4 @@
-import React, {useState, useCallback, useRef, useImperativeHandle} from 'react';
+import React, {useState, useCallback, useRef, useImperativeHandle, useEffect} from 'react';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
 import {withOnyx} from 'react-native-onyx';
@@ -45,12 +45,12 @@ const defaultProps = {
 function SuggestionMention({
     value,
     setValue,
+    selection,
     setSelection,
     isComposerFullSize,
     personalDetails,
     updateComment,
     composerHeight,
-    shouldShowReportRecipientLocalTime,
     forwardedRef,
     isAutoSuggestionPickerLarge,
     measureParentContainer,
@@ -168,6 +168,7 @@ function SuggestionMention({
                             name: detail.login,
                             source: UserUtils.getAvatar(detail.avatar, detail.accountID),
                             type: 'avatar',
+                            fallbackIcon: detail.fallbackIcon,
                         },
                     ],
                 });
@@ -198,7 +199,7 @@ function SuggestionMention({
             }
 
             const leftString = value.substring(0, indexOfLastNonWhitespaceCharAfterTheCursor);
-            const words = leftString.split(CONST.REGEX.SPECIAL_CHAR_OR_EMOJI);
+            const words = leftString.split(CONST.REGEX.SPACE_OR_EMOJI);
             const lastWord = _.last(words);
 
             let atSignIndex;
@@ -231,12 +232,9 @@ function SuggestionMention({
         [getMentionOptions, personalDetails, resetSuggestions, setHighlightedMentionIndex, value],
     );
 
-    const onSelectionChange = useCallback(
-        (e) => {
-            calculateMentionSuggestion(e.nativeEvent.selection.end);
-        },
-        [calculateMentionSuggestion],
-    );
+    useEffect(() => {
+        calculateMentionSuggestion(selection.end);
+    }, [selection, calculateMentionSuggestion]);
 
     const updateShouldShowSuggestionMenuToFalse = useCallback(() => {
         setSuggestionValues((prevState) => {
@@ -262,12 +260,11 @@ function SuggestionMention({
         forwardedRef,
         () => ({
             resetSuggestions,
-            onSelectionChange,
             triggerHotkeyActions,
             setShouldBlockSuggestionCalc,
             updateShouldShowSuggestionMenuToFalse,
         }),
-        [onSelectionChange, resetSuggestions, setShouldBlockSuggestionCalc, triggerHotkeyActions, updateShouldShowSuggestionMenuToFalse],
+        [resetSuggestions, setShouldBlockSuggestionCalc, triggerHotkeyActions, updateShouldShowSuggestionMenuToFalse],
     );
 
     if (!isMentionSuggestionsMenuVisible) {
@@ -287,7 +284,6 @@ function SuggestionMention({
             isComposerFullSize={isComposerFullSize}
             isMentionPickerLarge={isAutoSuggestionPickerLarge}
             composerHeight={composerHeight}
-            shouldIncludeReportRecipientLocalTimeHeight={shouldShowReportRecipientLocalTime}
             measureParentContainer={measureParentContainer}
         />
     );
diff --git a/src/pages/home/report/ReportActionCompose/Suggestions.js b/src/pages/home/report/ReportActionCompose/Suggestions.js
index ed2ab9586d52..a00bd342b17d 100644
--- a/src/pages/home/report/ReportActionCompose/Suggestions.js
+++ b/src/pages/home/report/ReportActionCompose/Suggestions.js
@@ -36,7 +36,6 @@ function Suggestions({
     setSelection,
     updateComment,
     composerHeight,
-    shouldShowReportRecipientLocalTime,
     forwardedRef,
     onInsertedEmoji,
     resetKeyboardInput,
@@ -66,8 +65,7 @@ function Suggestions({
 
     const onSelectionChange = useCallback((e) => {
         const emojiHandler = suggestionEmojiRef.current.onSelectionChange(e);
-        const mentionHandler = suggestionMentionRef.current.onSelectionChange(e);
-        return emojiHandler || mentionHandler;
+        return emojiHandler;
     }, []);
 
     const updateShouldShowSuggestionMenuToFalse = useCallback(() => {
@@ -102,10 +100,10 @@ function Suggestions({
         value,
         setValue,
         setSelection,
+        selection,
         isComposerFullSize,
         updateComment,
         composerHeight,
-        shouldShowReportRecipientLocalTime,
         isAutoSuggestionPickerLarge,
         measureParentContainer,
     };
@@ -116,7 +114,6 @@ function Suggestions({
                 ref={suggestionEmojiRef}
                 // eslint-disable-next-line react/jsx-props-no-spreading
                 {...baseProps}
-                selection={selection}
                 onInsertedEmoji={onInsertedEmoji}
                 resetKeyboardInput={resetKeyboardInput}
             />
diff --git a/src/pages/home/report/ReportActionCompose/composerWithSuggestionsProps.js b/src/pages/home/report/ReportActionCompose/composerWithSuggestionsProps.js
index b8d9f0b6d816..0c8f36114c44 100644
--- a/src/pages/home/report/ReportActionCompose/composerWithSuggestionsProps.js
+++ b/src/pages/home/report/ReportActionCompose/composerWithSuggestionsProps.js
@@ -74,9 +74,6 @@ const propTypes = {
     /** A method to call when the form is submitted */
     submitForm: PropTypes.func.isRequired,
 
-    /** Whether the recipient local time is shown or not */
-    shouldShowReportRecipientLocalTime: PropTypes.bool.isRequired,
-
     /** Whether the compose input is shown or not */
     shouldShowComposeInput: PropTypes.bool.isRequired,
 
diff --git a/src/pages/home/report/ReportActionCompose/suggestionProps.js b/src/pages/home/report/ReportActionCompose/suggestionProps.js
index 24cf51b018c4..815a1c5619f5 100644
--- a/src/pages/home/report/ReportActionCompose/suggestionProps.js
+++ b/src/pages/home/report/ReportActionCompose/suggestionProps.js
@@ -7,6 +7,12 @@ const baseProps = {
     /** Callback to update the current input value */
     setValue: PropTypes.func.isRequired,
 
+    /** The current selection value */
+    selection: PropTypes.shape({
+        start: PropTypes.number.isRequired,
+        end: PropTypes.number.isRequired,
+    }).isRequired,
+
     /** Callback to update the current selection */
     setSelection: PropTypes.func.isRequired,
 
@@ -16,9 +22,6 @@ const baseProps = {
     /** Callback to update the comment draft */
     updateComment: PropTypes.func.isRequired,
 
-    /** Flag whether we need to consider the participants */
-    shouldShowReportRecipientLocalTime: PropTypes.bool.isRequired,
-
     /** Meaures the parent container's position and dimensions. */
     measureParentContainer: PropTypes.func.isRequired,
 };
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 8425f78a3a10..d109c972ec69 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -64,9 +64,11 @@ import * as PersonalDetailsUtils from '../../../libs/PersonalDetailsUtils';
 import ReportActionItemBasicMessage from './ReportActionItemBasicMessage';
 import * as store from '../../../libs/actions/ReimbursementAccount/store';
 import * as BankAccounts from '../../../libs/actions/BankAccounts';
+import {ReactionListContext} from '../ReportScreenContext';
 import usePrevious from '../../../hooks/usePrevious';
-import ReportScreenContext from '../ReportScreenContext';
 import Permissions from '../../../libs/Permissions';
+import RenderHTML from '../../../components/RenderHTML';
+import ReportAttachmentsContext from './ReportAttachmentsContext';
 
 const propTypes = {
     ...windowDimensionsPropTypes,
@@ -128,7 +130,8 @@ function ReportActionItem(props) {
     const [isContextMenuActive, setIsContextMenuActive] = useState(ReportActionContextMenu.isActiveReportAction(props.action.reportActionID));
     const [isHidden, setIsHidden] = useState(false);
     const [moderationDecision, setModerationDecision] = useState(CONST.MODERATION.MODERATOR_DECISION_APPROVED);
-    const {reactionListRef} = useContext(ReportScreenContext);
+    const reactionListRef = useContext(ReactionListContext);
+    const {updateHiddenAttachments} = useContext(ReportAttachmentsContext);
     const textInputRef = useRef();
     const popoverAnchorRef = useRef();
     const downloadedPreviews = useRef([]);
@@ -136,6 +139,24 @@ function ReportActionItem(props) {
     const originalReportID = ReportUtils.getOriginalReportID(props.report.reportID, props.action);
     const originalReport = props.report.reportID === originalReportID ? props.report : ReportUtils.getReport(originalReportID);
 
+    // When active action changes, we need to update the `isContextMenuActive` state
+    const isActiveReportActionForMenu = ReportActionContextMenu.isActiveReportAction(props.action.reportActionID);
+    useEffect(() => {
+        setIsContextMenuActive(isActiveReportActionForMenu);
+    }, [isActiveReportActionForMenu]);
+
+    const updateHiddenState = useCallback(
+        (isHiddenValue) => {
+            setIsHidden(isHiddenValue);
+            const isAttachment = ReportUtils.isReportMessageAttachment(_.last(props.action.message));
+            if (!isAttachment) {
+                return;
+            }
+            updateHiddenAttachments(props.action.reportActionID, isHiddenValue);
+        },
+        [props.action.reportActionID, props.action.message, updateHiddenAttachments],
+    );
+
     useEffect(
         () => () => {
             // ReportActionContextMenu, EmojiPicker and PopoverReactionList are global components,
@@ -223,7 +244,8 @@ function ReportActionItem(props) {
                 selection,
                 popoverAnchorRef,
                 props.report.reportID,
-                props.action,
+                props.action.reportActionID,
+                originalReportID,
                 props.draftMessage,
                 () => {},
                 toggleContextMenuFromActiveReportAction,
@@ -231,7 +253,7 @@ function ReportActionItem(props) {
                 ReportUtils.chatIncludesChronos(originalReport),
             );
         },
-        [props.draftMessage, props.action, props.report.reportID, toggleContextMenuFromActiveReportAction, originalReport],
+        [props.draftMessage, props.action, props.report.reportID, toggleContextMenuFromActiveReportAction, originalReport, originalReportID],
     );
 
     const toggleReaction = useCallback(
@@ -361,7 +383,7 @@ function ReportActionItem(props) {
                                 <Button
                                     small
                                     style={[styles.mt2, styles.alignSelfStart]}
-                                    onPress={() => setIsHidden(!isHidden)}
+                                    onPress={() => updateHiddenState(!isHidden)}
                                 >
                                     <Text
                                         style={styles.buttonSmallText}
@@ -489,23 +511,35 @@ function ReportActionItem(props) {
                         checkIfContextMenuActive: toggleContextMenuFromActiveReportAction,
                     }}
                 >
-                    <OfflineWithFeedback pendingAction={props.action.pendingAction}>
-                        <MoneyRequestView
-                            report={props.report}
-                            shouldShowHorizontalRule={!props.shouldHideThreadDividerLine}
-                        />
-                    </OfflineWithFeedback>
+                    <MoneyRequestView
+                        report={props.report}
+                        shouldShowHorizontalRule={!props.shouldHideThreadDividerLine}
+                    />
                 </ShowContextMenuContext.Provider>
             );
         }
         if (ReportUtils.isTaskReport(props.report)) {
+            if (ReportUtils.isCanceledTaskReport(props.report, parentReportAction)) {
+                return (
+                    <>
+                        <ReportActionItemSingle
+                            action={parentReportAction}
+                            showHeader={!props.draftMessage}
+                            wrapperStyles={[styles.chatItem]}
+                            report={props.report}
+                        >
+                            <RenderHTML html={`<comment>${props.translate('parentReportAction.deletedTask')}</comment>`} />
+                        </ReportActionItemSingle>
+                        <View style={styles.reportHorizontalRule} />
+                    </>
+                );
+            }
+
             return (
-                <OfflineWithFeedback pendingAction={props.action.pendingAction}>
-                    <TaskView
-                        report={props.report}
-                        shouldShowHorizontalRule={!props.shouldHideThreadDividerLine}
-                    />
-                </OfflineWithFeedback>
+                <TaskView
+                    report={props.report}
+                    shouldShowHorizontalRule={!props.shouldHideThreadDividerLine}
+                />
             );
         }
         if (ReportUtils.isExpenseReport(props.report) || ReportUtils.isIOUReport(props.report)) {
@@ -555,25 +589,24 @@ function ReportActionItem(props) {
             withoutFocusOnSecondaryInteraction
             accessibilityLabel={props.translate('accessibilityHints.chatMessage')}
         >
-            <Hoverable disabled={Boolean(props.draftMessage)}>
+            <Hoverable
+                shouldHandleScroll
+                disabled={Boolean(props.draftMessage)}
+            >
                 {(hovered) => (
                     <View>
                         {props.shouldDisplayNewMarker && <UnreadActionIndicator reportActionID={props.action.reportActionID} />}
                         <MiniReportActionContextMenu
                             reportID={props.report.reportID}
-                            reportAction={props.action}
-                            isArchivedRoom={ReportUtils.isArchivedRoom(originalReport)}
+                            reportActionID={props.action.reportActionID}
+                            originalReportID={originalReportID}
+                            isArchivedRoom={ReportUtils.isArchivedRoom(props.report)}
                             displayAsGroup={props.displayAsGroup}
                             isVisible={hovered && !props.draftMessage && !hasErrors}
                             draftMessage={props.draftMessage}
                             isChronosReport={ReportUtils.chatIncludesChronos(originalReport)}
                         />
-                        <View
-                            style={StyleUtils.getReportActionItemStyle(
-                                hovered || isWhisper || isContextMenuActive || props.draftMessage,
-                                (props.network.isOffline && props.action.isLoading) || props.action.error,
-                            )}
-                        >
+                        <View style={StyleUtils.getReportActionItemStyle(hovered || isWhisper || isContextMenuActive || props.draftMessage)}>
                             <OfflineWithFeedback
                                 onClose={() => ReportActions.clearReportActionErrors(props.report.reportID, props.action)}
                                 pendingAction={props.draftMessage ? null : props.action.pendingAction}
@@ -581,9 +614,10 @@ function ReportActionItem(props) {
                                 errors={props.action.errors}
                                 errorRowStyles={[styles.ml10, styles.mr2]}
                                 needsOffscreenAlphaCompositing={ReportActionsUtils.isMoneyRequestAction(props.action)}
+                                shouldDisableStrikeThrough
                             >
                                 {isWhisper && (
-                                    <View style={[styles.flexRow, styles.pl5, styles.pt2]}>
+                                    <View style={[styles.flexRow, styles.pl5, styles.pt2, styles.pr3]}>
                                         <View style={[styles.pl6, styles.mr3]}>
                                             <Icon
                                                 src={Expensicons.Eye}
@@ -599,7 +633,7 @@ function ReportActionItem(props) {
                                             displayNamesWithTooltips={displayNamesWithTooltips}
                                             tooltipEnabled
                                             numberOfLines={1}
-                                            textStyles={[styles.chatItemMessageHeaderTimestamp]}
+                                            textStyles={[styles.chatItemMessageHeaderTimestamp, styles.flex1]}
                                             shouldUseFullTitle={isWhisperOnlyVisibleByUser}
                                         />
                                     </View>
@@ -629,19 +663,26 @@ export default compose(
     withReportActionsDrafts({
         propName: 'draftMessage',
         transformValue: (drafts, props) => {
-            const draftKey = `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${props.report.reportID}_${props.action.reportActionID}`;
+            const originalReportID = ReportUtils.getOriginalReportID(props.report.reportID, props.action);
+            const draftKey = `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${originalReportID}_${props.action.reportActionID}`;
             return lodashGet(drafts, draftKey, '');
         },
     }),
     withOnyx({
         preferredSkinTone: {
             key: ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE,
+            initialValue: CONST.EMOJI_DEFAULT_SKIN_TONE,
         },
         iouReport: {
-            key: ({action}) => `${ONYXKEYS.COLLECTION.REPORT}${ReportActionsUtils.getIOUReportIDFromReportActionPreview(action)}`,
+            key: ({action}) => {
+                const iouReportID = ReportActionsUtils.getIOUReportIDFromReportActionPreview(action);
+                return iouReportID ? `${ONYXKEYS.COLLECTION.REPORT}${iouReportID}` : undefined;
+            },
+            initialValue: {},
         },
         emojiReactions: {
             key: ({action}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${action.reportActionID}`,
+            initialValue: {},
         },
     }),
 )(
@@ -656,6 +697,7 @@ export default compose(
             _.isEqual(prevProps.emojiReactions, nextProps.emojiReactions) &&
             _.isEqual(prevProps.action, nextProps.action) &&
             _.isEqual(prevProps.report.pendingFields, nextProps.report.pendingFields) &&
+            _.isEqual(prevProps.report.isDeletedParentAction, nextProps.report.isDeletedParentAction) &&
             _.isEqual(prevProps.report.errorFields, nextProps.report.errorFields) &&
             lodashGet(prevProps.report, 'statusNum') === lodashGet(nextProps.report, 'statusNum') &&
             lodashGet(prevProps.report, 'stateNum') === lodashGet(nextProps.report, 'stateNum') &&
diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js
index d768fcacd5b7..24501e307759 100644
--- a/src/pages/home/report/ReportActionItemFragment.js
+++ b/src/pages/home/report/ReportActionItemFragment.js
@@ -1,5 +1,4 @@
 import React, {memo} from 'react';
-import {ActivityIndicator, View} from 'react-native';
 import PropTypes from 'prop-types';
 import Str from 'expensify-common/lib/str';
 import reportActionFragmentPropTypes from './reportActionFragmentPropTypes';
@@ -16,7 +15,6 @@ import compose from '../../../libs/compose';
 import convertToLTR from '../../../libs/convertToLTR';
 import {withNetwork} from '../../../components/OnyxProvider';
 import CONST from '../../../CONST';
-import applyStrikethrough from '../../../components/HTMLEngineProvider/applyStrikethrough';
 import editedLabelStyles from '../../../styles/editedLabelStyles';
 import UserDetailsTooltip from '../../../components/UserDetailsTooltip';
 import avatarPropTypes from '../../../components/avatarPropTypes';
@@ -28,9 +26,6 @@ const propTypes = {
     /** The message fragment needing to be displayed */
     fragment: reportActionFragmentPropTypes.isRequired,
 
-    /** Is this fragment an attachment? */
-    isAttachment: PropTypes.bool,
-
     /** If this fragment is attachment than has info? */
     attachmentInfo: PropTypes.shape({
         /** The file name of attachment */
@@ -49,9 +44,6 @@ const propTypes = {
     /** Message(text) of an IOU report action */
     iouMessage: PropTypes.string,
 
-    /** Does this fragment belong to a reportAction that has not yet loaded? */
-    loading: PropTypes.bool,
-
     /** The reportAction's source */
     source: PropTypes.oneOf(['Chronos', 'email', 'ios', 'android', 'web', 'email', '']),
 
@@ -77,7 +69,6 @@ const propTypes = {
 };
 
 const defaultProps = {
-    isAttachment: false,
     attachmentInfo: {
         name: '',
         size: 0,
@@ -85,7 +76,6 @@ const defaultProps = {
         source: '',
     },
     iouMessage: '',
-    loading: false,
     isSingleLine: false,
     source: '',
     style: [],
@@ -97,21 +87,8 @@ const defaultProps = {
 function ReportActionItemFragment(props) {
     switch (props.fragment.type) {
         case 'COMMENT': {
-            // If this is an attachment placeholder, return the placeholder component
-            if (props.isAttachment && props.loading) {
-                return Str.isImage(props.attachmentInfo.name) ? (
-                    <RenderHTML html={`<comment><img src="${props.attachmentInfo.source}" data-expensify-preview-modal-disabled="true"/></comment>`} />
-                ) : (
-                    <View style={[styles.chatItemAttachmentPlaceholder]}>
-                        <ActivityIndicator
-                            size="large"
-                            color={themeColors.textSupporting}
-                            style={[styles.flex1]}
-                        />
-                    </View>
-                );
-            }
             const {html, text} = props.fragment;
+            const isPendingDelete = props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && props.network.isOffline;
 
             // Threaded messages display "[Deleted message]" instead of being hidden altogether.
             // While offline we display the previous message with a strikethrough style. Once online we want to
@@ -128,34 +105,40 @@ function ReportActionItemFragment(props) {
 
             // Only render HTML if we have html in the fragment
             if (!differByLineBreaksOnly) {
-                const isPendingDelete = props.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && props.network.isOffline;
                 const editedTag = props.fragment.isEdited ? `<edited ${isPendingDelete ? 'deleted' : ''}></edited>` : '';
-                const htmlContent = applyStrikethrough(html + editedTag, isPendingDelete);
+                const htmlContent = isPendingDelete ? `<del>${html}</del>` : html;
 
-                return <RenderHTML html={props.source === 'email' ? `<email-comment>${htmlContent}</email-comment>` : `<comment>${htmlContent}</comment>`} />;
+                const htmlWithTag = editedTag ? `${htmlContent}${editedTag}` : htmlContent;
+
+                return <RenderHTML html={props.source === 'email' ? `<email-comment>${htmlWithTag}</email-comment>` : `<comment>${htmlWithTag}</comment>`} />;
             }
             const containsOnlyEmojis = EmojiUtils.containsOnlyEmojis(text);
 
             return (
-                <Text
-                    selectable={!DeviceCapabilities.canUseTouchScreen() || !props.isSmallScreenWidth}
-                    style={[containsOnlyEmojis ? styles.onlyEmojisText : undefined, styles.ltr, ...props.style]}
-                >
-                    {convertToLTR(props.iouMessage || text)}
+                <Text style={[containsOnlyEmojis ? styles.onlyEmojisText : undefined, styles.ltr, ...props.style]}>
+                    <Text
+                        selectable={!DeviceCapabilities.canUseTouchScreen() || !props.isSmallScreenWidth}
+                        style={[containsOnlyEmojis ? styles.onlyEmojisText : undefined, styles.ltr, ...props.style, isPendingDelete ? styles.offlineFeedback.deleted : undefined]}
+                    >
+                        {convertToLTR(props.iouMessage || text)}
+                    </Text>
                     {Boolean(props.fragment.isEdited) && (
-                        <Text
-                            fontSize={variables.fontSizeSmall}
-                            color={themeColors.textSupporting}
-                            style={[editedLabelStyles, ...props.style]}
-                        >
+                        <>
                             <Text
                                 selectable={false}
-                                style={[containsOnlyEmojis ? styles.onlyEmojisTextLineHeight : undefined, styles.w1, styles.userSelectNone]}
+                                style={[containsOnlyEmojis ? styles.onlyEmojisTextLineHeight : undefined, styles.userSelectNone]}
+                                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                             >
                                 {' '}
                             </Text>
-                            {props.translate('reportActionCompose.edited')}
-                        </Text>
+                            <Text
+                                fontSize={variables.fontSizeSmall}
+                                color={themeColors.textSupporting}
+                                style={[editedLabelStyles, isPendingDelete ? styles.offlineFeedback.deleted : undefined, ...props.style]}
+                            >
+                                {props.translate('reportActionCompose.edited')}
+                            </Text>
+                        </>
                     )}
                 </Text>
             );
diff --git a/src/pages/home/report/ReportActionItemMessage.js b/src/pages/home/report/ReportActionItemMessage.js
index bc92889158d0..a3d8494c38de 100644
--- a/src/pages/home/report/ReportActionItemMessage.js
+++ b/src/pages/home/report/ReportActionItemMessage.js
@@ -54,14 +54,12 @@ function ReportActionItemMessage(props) {
                     <ReportActionItemFragment
                         key={`actionFragment-${props.action.reportActionID}-${index}`}
                         fragment={fragment}
-                        isAttachment={props.action.isAttachment}
                         iouMessage={iouMessage}
                         isThreadParentMessage={ReportActionsUtils.isThreadParentMessage(props.action, props.reportID)}
                         attachmentInfo={props.action.attachmentInfo}
                         pendingAction={props.action.pendingAction}
                         source={lodashGet(props.action, 'originalMessage.source')}
                         accountID={props.action.actorAccountID}
-                        loading={props.action.isLoading}
                         style={props.style}
                     />
                 ))
diff --git a/src/pages/home/report/ReportActionItemMessageEdit.js b/src/pages/home/report/ReportActionItemMessageEdit.js
index e2c50b288fe5..3ceaf69b52f5 100644
--- a/src/pages/home/report/ReportActionItemMessageEdit.js
+++ b/src/pages/home/report/ReportActionItemMessageEdit.js
@@ -7,14 +7,12 @@ import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import Str from 'expensify-common/lib/str';
 import reportActionPropTypes from './reportActionPropTypes';
 import styles from '../../../styles/styles';
-import compose from '../../../libs/compose';
 import themeColors from '../../../styles/themes/default';
 import * as StyleUtils from '../../../styles/StyleUtils';
 import containerComposeStyles from '../../../styles/containerComposeStyles';
 import Composer from '../../../components/Composer';
 import * as Report from '../../../libs/actions/Report';
-import {withReportActionsDrafts} from '../../../components/OnyxProvider';
-import openReportActionComposeViewWhenClosingMessageEdit from '../../../libs/openReportActionComposeViewWhenClosingMessageEdit';
+import setShouldShowComposeInputKeyboardAware from '../../../libs/setShouldShowComposeInputKeyboardAware';
 import ReportActionComposeFocusManager from '../../../libs/ReportActionComposeFocusManager';
 import EmojiPickerButton from '../../../components/EmojiPicker/EmojiPickerButton';
 import Icon from '../../../components/Icon';
@@ -22,24 +20,23 @@ import * as Expensicons from '../../../components/Icon/Expensicons';
 import Tooltip from '../../../components/Tooltip';
 import * as ReportActionContextMenu from './ContextMenu/ReportActionContextMenu';
 import * as ReportUtils from '../../../libs/ReportUtils';
+import * as ReportActionsUtils from '../../../libs/ReportActionsUtils';
 import * as EmojiUtils from '../../../libs/EmojiUtils';
 import reportPropTypes from '../../reportPropTypes';
 import ExceededCommentLength from '../../../components/ExceededCommentLength';
 import CONST from '../../../CONST';
 import refPropTypes from '../../../components/refPropTypes';
 import * as ComposerUtils from '../../../libs/ComposerUtils';
-import * as ComposerActions from '../../../libs/actions/Composer';
 import * as User from '../../../libs/actions/User';
 import PressableWithFeedback from '../../../components/Pressable/PressableWithFeedback';
 import getButtonState from '../../../libs/getButtonState';
-import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
 import useLocalize from '../../../hooks/useLocalize';
 import useKeyboardState from '../../../hooks/useKeyboardState';
 import useWindowDimensions from '../../../hooks/useWindowDimensions';
 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 */
@@ -64,14 +61,8 @@ const propTypes = {
     /** Whether or not the emoji picker is disabled */
     shouldDisableEmojiPicker: PropTypes.bool,
 
-    /** Draft message - if this is set the comment is in 'edit' mode */
-    // eslint-disable-next-line react/forbid-prop-types
-    drafts: PropTypes.object,
-
     /** Stores user's preferred skin tone */
     preferredSkinTone: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-
-    ...withLocalizePropTypes,
 };
 
 const defaultProps = {
@@ -79,22 +70,21 @@ const defaultProps = {
     report: {},
     shouldDisableEmojiPicker: false,
     preferredSkinTone: CONST.EMOJI_DEFAULT_SKIN_TONE,
-    drafts: {},
 };
 
 // native ids
-const saveButtonID = 'saveButton';
-const cancelButtonID = 'cancelButton';
 const emojiButtonID = 'emojiButton';
 const messageEditInput = 'messageEditInput';
 
+const isMobileSafari = Browser.isMobileSafari();
+
 function ReportActionItemMessageEdit(props) {
     const reportScrollManager = useReportScrollManager();
-    const {translate} = useLocalize();
+    const {translate, preferredLocale} = 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 +92,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);
 
@@ -111,34 +112,56 @@ function ReportActionItemMessageEdit(props) {
     const isFocusedRef = useRef(false);
     const insertedEmojis = useRef([]);
 
+    useEffect(() => {
+        if (ReportActionsUtils.isDeletedAction(props.action) || props.draftMessage === props.action.message[0].html) {
+            return;
+        }
+        setDraft(Str.htmlDecode(props.draftMessage));
+    }, [props.draftMessage, props.action]);
+
     useEffect(() => {
         // required for keeping last state of isFocused variable
         isFocusedRef.current = isFocused;
     }, [isFocused]);
 
+    // We consider the report action active if it's focused, its emoji picker is open or its context menu is open
+    const isActive = useCallback(
+        () => isFocusedRef.current || EmojiPickerAction.isActive(props.action.reportActionID) || ReportActionContextMenu.isActiveReportAction(props.action.reportActionID),
+        [props.action.reportActionID],
+    );
+
     useEffect(() => {
         // For mobile Safari, updating the selection prop on an unfocused input will cause it to automatically gain focus
         // and subsequent programmatic focus shifts (e.g., modal focus trap) to show the blue frame (:focus-visible style),
         // so we need to ensure that it is only updated after focus.
-        setDraft((prevDraft) => {
-            setSelection({
-                start: prevDraft.length,
-                end: prevDraft.length,
+        if (isMobileSafari) {
+            setDraft((prevDraft) => {
+                setSelection({
+                    start: prevDraft.length,
+                    end: prevDraft.length,
+                });
+                return prevDraft;
             });
-            return prevDraft;
-        });
+        }
 
         return () => {
-            // Skip if this is not the focused message so the other edit composer stays focused.
-            // In small screen devices, when EmojiPicker is shown, the current edit message will lose focus, we need to check this case as well.
-            if (!isFocusedRef.current && !EmojiPickerAction.isActive(props.action.reportActionID)) {
+            // Skip if the current report action is not active
+            if (!isActive()) {
                 return;
             }
 
+            if (EmojiPickerAction.isActive(props.action.reportActionID)) {
+                EmojiPickerAction.clearActive();
+            }
+            if (ReportActionContextMenu.isActiveReportAction(props.action.reportActionID)) {
+                ReportActionContextMenu.clearActiveReportAction();
+            }
+
             // Show the main composer when the focused message is deleted from another client
             // to prevent the main composer stays hidden until we swtich to another chat.
-            ComposerActions.setShouldShowComposeInput(true);
+            setShouldShowComposeInputKeyboardAware(true);
         };
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- this cleanup needs to be called only on unmount
     }, [props.action.reportActionID]);
 
     /**
@@ -149,9 +172,9 @@ function ReportActionItemMessageEdit(props) {
     const debouncedSaveDraft = useMemo(
         () =>
             _.debounce((newDraft) => {
-                Report.saveReportActionDraft(props.reportID, props.action.reportActionID, newDraft);
+                Report.saveReportActionDraft(props.reportID, props.action, newDraft);
             }, 1000),
-        [props.reportID, props.action.reportActionID],
+        [props.reportID, props.action],
     );
 
     /**
@@ -174,7 +197,7 @@ function ReportActionItemMessageEdit(props) {
      */
     const updateDraft = useCallback(
         (newDraftInput) => {
-            const {text: newDraft, emojis} = EmojiUtils.replaceAndExtractEmojis(newDraftInput, props.preferredSkinTone, props.preferredLocale);
+            const {text: newDraft, emojis} = EmojiUtils.replaceAndExtractEmojis(newDraftInput, props.preferredSkinTone, preferredLocale);
 
             if (!_.isEmpty(emojis)) {
                 insertedEmojis.current = [...insertedEmojis.current, ...emojis];
@@ -202,7 +225,7 @@ function ReportActionItemMessageEdit(props) {
                 debouncedSaveDraft(props.action.message[0].html);
             }
         },
-        [props.action.message, debouncedSaveDraft, debouncedUpdateFrequentlyUsedEmojis, props.preferredSkinTone, props.preferredLocale],
+        [props.action.message, debouncedSaveDraft, debouncedUpdateFrequentlyUsedEmojis, props.preferredSkinTone, preferredLocale],
     );
 
     /**
@@ -210,10 +233,12 @@ function ReportActionItemMessageEdit(props) {
      */
     const deleteDraft = useCallback(() => {
         debouncedSaveDraft.cancel();
-        Report.saveReportActionDraft(props.reportID, props.action.reportActionID, '');
-        ComposerActions.setShouldShowComposeInput(true);
-        ReportActionComposeFocusManager.clear();
-        ReportActionComposeFocusManager.focus();
+        Report.saveReportActionDraft(props.reportID, props.action, '');
+
+        if (isActive()) {
+            ReportActionComposeFocusManager.clear();
+            ReportActionComposeFocusManager.focus();
+        }
 
         // Scroll to the last comment after editing to make sure the whole comment is clearly visible in the report.
         if (props.index === 0) {
@@ -222,7 +247,7 @@ function ReportActionItemMessageEdit(props) {
                 keyboardDidHideListener.remove();
             });
         }
-    }, [props.action.reportActionID, debouncedSaveDraft, props.index, props.reportID, reportScrollManager]);
+    }, [props.action, debouncedSaveDraft, props.index, props.reportID, reportScrollManager, isActive]);
 
     /**
      * Save the draft of the comment to be the new comment message. This will take the comment out of "edit mode" with
@@ -240,29 +265,15 @@ function ReportActionItemMessageEdit(props) {
 
         const trimmedNewDraft = draft.trim();
 
-        const report = ReportUtils.getReport(props.reportID);
-
-        // Updates in child message should cause the parent draft message to change
-        if (report.parentReportActionID && lodashGet(props.action, 'childType', '') === CONST.REPORT.TYPE.CHAT) {
-            if (lodashGet(props.drafts, [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${report.parentReportID}_${props.action.reportActionID}`], undefined)) {
-                Report.saveReportActionDraft(report.parentReportID, props.action.reportActionID, trimmedNewDraft);
-            }
-        }
-        // Updates in the parent message should cause the child draft message to change
-        if (props.action.childReportID) {
-            if (lodashGet(props.drafts, [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${props.action.childReportID}_${props.action.reportActionID}`], undefined)) {
-                Report.saveReportActionDraft(props.action.childReportID, props.action.reportActionID, trimmedNewDraft);
-            }
-        }
-
         // When user tries to save the empty message, it will delete it. Prompt the user to confirm deleting.
         if (!trimmedNewDraft) {
+            textInputRef.current.blur();
             ReportActionContextMenu.showDeleteModal(props.reportID, props.action, false, deleteDraft, () => InteractionManager.runAfterInteractions(() => textInputRef.current.focus()));
             return;
         }
         Report.editReportComment(props.reportID, props.action, trimmedNewDraft);
         deleteDraft();
-    }, [props.action, debouncedSaveDraft, deleteDraft, draft, props.reportID, props.drafts]);
+    }, [props.action, debouncedSaveDraft, deleteDraft, draft, props.reportID]);
 
     /**
      * @param {String} emoji
@@ -309,7 +320,6 @@ function ReportActionItemMessageEdit(props) {
                         <PressableWithFeedback
                             onPress={deleteDraft}
                             style={styles.chatItemSubmitButton}
-                            nativeID={cancelButtonID}
                             accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
                             accessibilityLabel={translate('common.close')}
                             // disable dimming
@@ -317,6 +327,8 @@ function ReportActionItemMessageEdit(props) {
                             pressDimmingValue={1}
                             hoverStyle={StyleUtils.getButtonBackgroundColorStyle(CONST.BUTTON_STATES.ACTIVE)}
                             pressStyle={StyleUtils.getButtonBackgroundColorStyle(CONST.BUTTON_STATES.PRESSED)}
+                            // Keep focus on the composer when cancel button is clicked.
+                            onMouseDown={(e) => e.preventDefault()}
                         >
                             {({hovered, pressed}) => (
                                 <Icon
@@ -340,6 +352,7 @@ function ReportActionItemMessageEdit(props) {
                         <Composer
                             multiline
                             ref={(el) => {
+                                ReportActionComposeFocusManager.editComposerRef.current = el;
                                 textInputRef.current = el;
                                 // eslint-disable-next-line no-param-reassign
                                 props.forwardedRef.current = el;
@@ -353,21 +366,23 @@ function ReportActionItemMessageEdit(props) {
                             onFocus={() => {
                                 setIsFocused(true);
                                 reportScrollManager.scrollToIndex({animated: true, index: props.index}, true);
-                                ComposerActions.setShouldShowComposeInput(false);
+                                setShouldShowComposeInputKeyboardAware(false);
+
+                                // Clear active report action when another action gets focused
+                                if (!EmojiPickerAction.isActive(props.action.reportActionID)) {
+                                    EmojiPickerAction.clearActive();
+                                }
+                                if (!ReportActionContextMenu.isActiveReportAction(props.action.reportActionID)) {
+                                    ReportActionContextMenu.clearActiveReportAction();
+                                }
                             }}
                             onBlur={(event) => {
                                 setIsFocused(false);
                                 const relatedTargetId = lodashGet(event, 'nativeEvent.relatedTarget.id');
-
-                                // Return to prevent re-render when save/cancel button is pressed which cancels the onPress event by re-rendering
-                                if (_.contains([saveButtonID, cancelButtonID, emojiButtonID], relatedTargetId)) {
-                                    return;
-                                }
-
-                                if (messageEditInput === relatedTargetId) {
+                                if (_.contains([messageEditInput, emojiButtonID], relatedTargetId)) {
                                     return;
                                 }
-                                openReportActionComposeViewWhenClosingMessageEdit();
+                                setShouldShowComposeInputKeyboardAware(true);
                             }}
                             selection={selection}
                             onSelectionChange={(e) => setSelection(e.nativeEvent.selection)}
@@ -391,12 +406,13 @@ function ReportActionItemMessageEdit(props) {
                             <PressableWithFeedback
                                 style={[styles.chatItemSubmitButton, hasExceededMaxCommentLength ? {} : styles.buttonSuccess]}
                                 onPress={publishDraft}
-                                nativeID={saveButtonID}
                                 disabled={hasExceededMaxCommentLength}
                                 accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
                                 accessibilityLabel={translate('common.saveChanges')}
                                 hoverDimmingValue={1}
                                 pressDimmingValue={0.2}
+                                // Keep focus on the composer when send button is clicked.
+                                onMouseDown={(e) => e.preventDefault()}
                             >
                                 <Icon
                                     src={Expensicons.Checkmark}
@@ -419,17 +435,10 @@ ReportActionItemMessageEdit.propTypes = propTypes;
 ReportActionItemMessageEdit.defaultProps = defaultProps;
 ReportActionItemMessageEdit.displayName = 'ReportActionItemMessageEdit';
 
-export default compose(
-    withLocalize,
-    withReportActionsDrafts({
-        propName: 'drafts',
-    }),
-)(
-    React.forwardRef((props, ref) => (
-        <ReportActionItemMessageEdit
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...props}
-            forwardedRef={ref}
-        />
-    )),
-);
+export default React.forwardRef((props, ref) => (
+    <ReportActionItemMessageEdit
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...props}
+        forwardedRef={ref}
+    />
+));
diff --git a/src/pages/home/report/ReportActionItemParentAction.js b/src/pages/home/report/ReportActionItemParentAction.js
index 68c5163643b5..8e1fb6aafdd4 100644
--- a/src/pages/home/report/ReportActionItemParentAction.js
+++ b/src/pages/home/report/ReportActionItemParentAction.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import {View} from 'react-native';
+import {View, Image} from 'react-native';
 import lodashGet from 'lodash/get';
 import {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
@@ -15,6 +15,7 @@ import withLocalize from '../../../components/withLocalize';
 import ReportActionItem from './ReportActionItem';
 import reportActionPropTypes from './reportActionPropTypes';
 import * as ReportActionsUtils from '../../../libs/ReportActionsUtils';
+import EmptyStateBackgroundImage from '../../../../assets/images/empty-state_background-fade.png';
 
 const propTypes = {
     /** Flag to show, hide the thread divider line */
@@ -60,6 +61,11 @@ function ReportActionItemParentAction(props) {
             onClose={() => Report.navigateToConciergeChatAndDeleteReport(props.report.reportID)}
         >
             <View style={StyleUtils.getReportWelcomeContainerStyle(props.isSmallScreenWidth)}>
+                <Image
+                    pointerEvents="none"
+                    source={EmptyStateBackgroundImage}
+                    style={StyleUtils.getReportWelcomeBackgroundImageStyle(props.isSmallScreenWidth)}
+                />
                 <View style={[styles.p5, StyleUtils.getReportWelcomeTopMarginStyle(props.isSmallScreenWidth)]} />
                 {parentReportAction && (
                     <ReportActionItem
diff --git a/src/pages/home/report/ReportActionItemSingle.js b/src/pages/home/report/ReportActionItemSingle.js
index bfbce8aed336..162f28021b94 100644
--- a/src/pages/home/report/ReportActionItemSingle.js
+++ b/src/pages/home/report/ReportActionItemSingle.js
@@ -80,17 +80,17 @@ const defaultProps = {
 };
 
 const showUserDetails = (accountID) => {
-    Navigation.navigate(ROUTES.getProfileRoute(accountID));
+    Navigation.navigate(ROUTES.PROFILE.getRoute(accountID));
 };
 
 const showWorkspaceDetails = (reportID) => {
-    Navigation.navigate(ROUTES.getReportDetailsRoute(reportID));
+    Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID));
 };
 
 function ReportActionItemSingle(props) {
     const actorAccountID = props.action.actorAccountID;
     let {displayName} = props.personalDetailsList[actorAccountID] || {};
-    const {avatar, login, pendingFields, status} = props.personalDetailsList[actorAccountID] || {};
+    const {avatar, login, pendingFields, status, fallbackIcon} = props.personalDetailsList[actorAccountID] || {};
     let actorHint = (login || displayName || '').replace(CONST.REGEX.MERGED_ACCOUNT_PREFIX, '');
     const displayAllActors = useMemo(() => props.action.actionName === CONST.REPORT.ACTIONS.TYPE.REPORTPREVIEW && props.iouReport, [props.action.actionName, props.iouReport]);
     const isWorkspaceActor = ReportUtils.isPolicyExpenseChat(props.report) && (!actorAccountID || displayAllActors);
@@ -114,14 +114,16 @@ function ReportActionItemSingle(props) {
     let secondaryAvatar = {};
     const primaryDisplayName = displayName;
     if (displayAllActors) {
-        const secondaryUserDetails = props.personalDetailsList[props.iouReport.ownerAccountID] || {};
+        // The ownerAccountID and actorAccountID can be the same if the a user requests money back from the IOU's original creator, in that case we need to use managerID to avoid displaying the same user twice
+        const secondaryAccountId = props.iouReport.ownerAccountID === actorAccountID ? props.iouReport.managerID : props.iouReport.ownerAccountID;
+        const secondaryUserDetails = props.personalDetailsList[secondaryAccountId] || {};
         const secondaryDisplayName = lodashGet(secondaryUserDetails, 'displayName', '');
         displayName = `${primaryDisplayName} & ${secondaryDisplayName}`;
         secondaryAvatar = {
-            source: UserUtils.getAvatar(secondaryUserDetails.avatar, props.iouReport.ownerAccountID),
+            source: UserUtils.getAvatar(secondaryUserDetails.avatar, secondaryAccountId),
             type: CONST.ICON_TYPE_AVATAR,
             name: secondaryDisplayName,
-            id: props.iouReport.ownerAccountID,
+            id: secondaryAccountId,
         };
     } else if (!isWorkspaceActor) {
         secondaryAvatar = ReportUtils.getIcons(props.report, {})[props.report.isOwnPolicyExpenseChat ? 0 : 1];
@@ -149,7 +151,7 @@ function ReportActionItemSingle(props) {
         } else {
             // Show participants page IOU report preview
             if (displayAllActors) {
-                Navigation.navigate(ROUTES.getReportParticipantsRoute(iouReportID));
+                Navigation.navigate(ROUTES.REPORT_PARTICIPANTS.getRoute(iouReportID));
                 return;
             }
             showUserDetails(props.action.delegateAccountID ? props.action.delegateAccountID : actorAccountID);
@@ -198,6 +200,7 @@ function ReportActionItemSingle(props) {
                         source={icon.source}
                         type={icon.type}
                         name={icon.name}
+                        fallbackIcon={fallbackIcon}
                     />
                 </View>
             </UserDetailsTooltip>
@@ -238,8 +241,6 @@ function ReportActionItemSingle(props) {
                                     key={`person-${props.action.reportActionID}-${index}`}
                                     accountID={actorAccountID}
                                     fragment={fragment}
-                                    isAttachment={props.action.isAttachment}
-                                    isLoading={props.action.isLoading}
                                     delegateAccountID={props.action.delegateAccountID}
                                     isSingleLine
                                     actorIcon={icon}
diff --git a/src/pages/home/report/ReportActionItemThread.js b/src/pages/home/report/ReportActionItemThread.js
index ebd965e80daf..9c688911759e 100644
--- a/src/pages/home/report/ReportActionItemThread.js
+++ b/src/pages/home/report/ReportActionItemThread.js
@@ -62,6 +62,7 @@ function ReportActionItemThread(props) {
                         <Text
                             selectable={false}
                             style={[styles.link, styles.ml2, styles.h4, styles.noWrap]}
+                            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                         >
                             {`${numberOfRepliesText} ${replyText}`}
                         </Text>
@@ -69,6 +70,7 @@ function ReportActionItemThread(props) {
                             selectable={false}
                             numberOfLines={1}
                             style={[styles.ml2, styles.textMicroSupporting, styles.flex1]}
+                            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                         >
                             {timeStamp}
                         </Text>
diff --git a/src/pages/home/report/ReportActionsList.js b/src/pages/home/report/ReportActionsList.js
index 7f897ee825fb..0163a7ff2b4f 100644
--- a/src/pages/home/report/ReportActionsList.js
+++ b/src/pages/home/report/ReportActionsList.js
@@ -1,28 +1,26 @@
 import PropTypes from 'prop-types';
-import React, {useCallback, useEffect, useState, useRef, useMemo} from 'react';
-import Animated, {useSharedValue, useAnimatedStyle, withTiming} from 'react-native-reanimated';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
+import Animated, {useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated';
 import _ from 'underscore';
+import CONST from '../../../CONST';
 import InvertedFlatList from '../../../components/InvertedFlatList';
-import compose from '../../../libs/compose';
-import styles from '../../../styles/styles';
-import * as ReportUtils from '../../../libs/ReportUtils';
-import * as Report from '../../../libs/actions/Report';
-import withWindowDimensions, {windowDimensionsPropTypes} from '../../../components/withWindowDimensions';
-import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes, withCurrentUserPersonalDetailsDefaultProps} from '../../../components/withCurrentUserPersonalDetails';
 import {withPersonalDetails} from '../../../components/OnyxProvider';
-import ReportActionItem from './ReportActionItem';
-import ReportActionItemParentAction from './ReportActionItemParentAction';
 import ReportActionsSkeletonView from '../../../components/ReportActionsSkeletonView';
-import variables from '../../../styles/variables';
-import * as ReportActionsUtils from '../../../libs/ReportActionsUtils';
-import reportActionPropTypes from './reportActionPropTypes';
-import CONST from '../../../CONST';
-import reportPropTypes from '../../reportPropTypes';
+import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes} from '../../../components/withCurrentUserPersonalDetails';
+import withWindowDimensions, {windowDimensionsPropTypes} from '../../../components/withWindowDimensions';
 import useLocalize from '../../../hooks/useLocalize';
 import useNetwork from '../../../hooks/useNetwork';
+import useReportScrollManager from '../../../hooks/useReportScrollManager';
 import DateUtils from '../../../libs/DateUtils';
+import * as ReportUtils from '../../../libs/ReportUtils';
+import * as Report from '../../../libs/actions/Report';
+import compose from '../../../libs/compose';
+import styles from '../../../styles/styles';
+import variables from '../../../styles/variables';
+import reportPropTypes from '../../reportPropTypes';
 import FloatingMessageCounter from './FloatingMessageCounter';
-import useReportScrollManager from '../../../hooks/useReportScrollManager';
+import ReportActionsListItemRenderer from './ReportActionsListItemRenderer';
+import reportActionPropTypes from './reportActionPropTypes';
 
 const propTypes = {
     /** The report currently being looked at */
@@ -34,6 +32,9 @@ const propTypes = {
     /** The ID of the most recent IOU report action connected with the shown report */
     mostRecentIOUReportActionID: PropTypes.string,
 
+    /** The report metadata loading states */
+    isLoadingReportActions: PropTypes.bool,
+
     /** Are we loading more report actions? */
     isLoadingMoreReportActions: PropTypes.bool,
 
@@ -63,6 +64,7 @@ const defaultProps = {
     personalDetails: {},
     onScroll: () => {},
     mostRecentIOUReportActionID: '',
+    isLoadingReportActions: false,
     isLoadingMoreReportActions: false,
     ...withCurrentUserPersonalDetailsDefaultProps,
 };
@@ -74,6 +76,12 @@ const MSG_VISIBLE_THRESHOLD = 250;
 // the useRef value gets reset when the reportID changes, so we use a global variable to keep track
 let prevReportID = null;
 
+// In the component we are subscribing to the arrival of new actions.
+// As there is the possibility that there are multiple instances of a ReportScreen
+// for the same report, we only ever want one subscription to be active, as
+// the subscriptions could otherwise be conflicting.
+const newActionUnsubscribeMap = {};
+
 /**
  * Create a unique key for each action in the FlatList.
  * We use the reportActionID that is a string representation of a random 64-bit int, which should be
@@ -92,6 +100,8 @@ function isMessageUnread(message, lastReadTime) {
 
 function ReportActionsList({
     report,
+    isLoadingReportActions,
+    isLoadingMoreReportActions,
     sortedReportActions,
     windowHeight,
     onScroll,
@@ -109,14 +119,15 @@ function ReportActionsList({
     const {isOffline} = useNetwork();
     const opacity = useSharedValue(0);
     const userActiveSince = useRef(null);
-    const currentUnreadMarker = useRef(null);
+    const [currentUnreadMarker, setCurrentUnreadMarker] = useState(null);
     const scrollingVerticalOffset = useRef(0);
     const readActionSkipped = useRef(false);
     const reportActionSize = useRef(sortedReportActions.length);
+    const firstRenderRef = useRef(true);
 
-    // Considering that renderItem is enclosed within a useCallback, marking it as "read" twice will retain the value as "true," preventing the useCallback from re-executing.
-    // However, if we create and listen to an object, it will lead to a new useCallback execution.
-    const [messageManuallyMarked, setMessageManuallyMarked] = useState({read: false});
+    // This state is used to force a re-render when the user manually marks a message as unread
+    // by using a timestamp you can force re-renders without having to worry about if another message was marked as unread before
+    const [messageManuallyMarkedUnread, setMessageManuallyMarkedUnread] = useState(0);
     const [isFloatingMessageCounterVisible, setIsFloatingMessageCounterVisible] = useState(false);
     const animatedStyles = useAnimatedStyle(() => ({
         opacity: opacity.value,
@@ -125,7 +136,6 @@ function ReportActionsList({
     useEffect(() => {
         opacity.value = withTiming(1, {duration: 100});
     }, [opacity]);
-    const [skeletonViewHeight, setSkeletonViewHeight] = useState(0);
 
     useEffect(() => {
         // If the reportID changes, we reset the userActiveSince to null, we need to do it because
@@ -152,35 +162,73 @@ function ReportActionsList({
             }
         }
 
-        if (currentUnreadMarker.current || reportActionSize.current === sortedReportActions.length) {
+        if (currentUnreadMarker || reportActionSize.current === sortedReportActions.length) {
             return;
         }
 
         reportActionSize.current = sortedReportActions.length;
-        currentUnreadMarker.current = null;
+        setCurrentUnreadMarker(null);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [sortedReportActions.length, report.reportID]);
 
     useEffect(() => {
         const didManuallyMarkReportAsUnread = report.lastReadTime < DateUtils.getDBTime() && ReportUtils.isUnread(report);
-        if (!didManuallyMarkReportAsUnread) {
-            setMessageManuallyMarked({read: false});
+        if (didManuallyMarkReportAsUnread) {
+            // Clearing the current unread marker so that it can be recalculated
+            setCurrentUnreadMarker(null);
+            setMessageManuallyMarkedUnread(new Date().getTime());
             return;
         }
 
-        // Clearing the current unread marker so that it can be recalculated
-        currentUnreadMarker.current = null;
-        setMessageManuallyMarked({read: true});
+        setMessageManuallyMarkedUnread(0);
 
         // We only care when a new lastReadTime is set in the report
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [report.lastReadTime]);
 
+    useEffect(() => {
+        // Why are we doing this, when in the cleanup of the useEffect we are already calling the unsubscribe function?
+        // Answer: On web, when navigating to another report screen, the previous report screen doesn't get unmounted,
+        //         meaning that the cleanup might not get called. When we then open a report we had open already previosuly, a new
+        //         ReportScreen will get created. Thus, we have to cancel the earlier subscription of the previous screen,
+        //         because the two subscriptions could conflict!
+        //         In case we return to the previous screen (e.g. by web back navigation) the useEffect for that screen would
+        //         fire again, as the focus has changed and will set up the subscription correctly again.
+        const previousSubUnsubscribe = newActionUnsubscribeMap[report.reportID];
+        if (previousSubUnsubscribe) {
+            previousSubUnsubscribe();
+        }
+
+        // This callback is triggered when a new action arrives via Pusher and the event is emitted from Report.js. This allows us to maintain
+        // a single source of truth for the "new action" event instead of trying to derive that a new action has appeared from looking at props.
+        const unsubscribe = Report.subscribeToNewActionEvent(report.reportID, (isFromCurrentUser) => {
+            // If a new comment is added and it's from the current user scroll to the bottom otherwise leave the user positioned where
+            // they are now in the list.
+            if (!isFromCurrentUser) {
+                return;
+            }
+            reportScrollManager.scrollToBottom();
+        });
+
+        const cleanup = () => {
+            if (unsubscribe) {
+                unsubscribe();
+            }
+            Report.unsubscribeFromReportChannel(report.reportID);
+        };
+
+        newActionUnsubscribeMap[report.reportID] = cleanup;
+
+        return cleanup;
+
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [report.reportID]);
+
     /**
      * Show/hide the new floating message counter when user is scrolling back/forth in the history of messages.
      */
     const handleUnreadFloatingButton = () => {
-        if (scrollingVerticalOffset.current > VERTICAL_OFFSET_THRESHOLD && !isFloatingMessageCounterVisible && !!currentUnreadMarker.current) {
+        if (scrollingVerticalOffset.current > VERTICAL_OFFSET_THRESHOLD && !isFloatingMessageCounterVisible && !!currentUnreadMarker) {
             setIsFloatingMessageCounterVisible(true);
         }
 
@@ -216,6 +264,15 @@ function ReportActionsList({
         return Math.ceil(availableHeight / minimumReportActionHeight);
     }, [windowHeight]);
 
+    /**
+     * Thread's divider line should hide when the first chat in the thread is marked as unread.
+     * This is so that it will not be conflicting with header's separator line.
+     */
+    const shouldHideThreadDividerLine = useMemo(
+        () => sortedReportActions.length > 1 && sortedReportActions[sortedReportActions.length - 2].reportActionID === currentUnreadMarker,
+        [sortedReportActions, currentUnreadMarker],
+    );
+
     /**
      * @param {Object} args
      * @param {Number} args.index
@@ -225,72 +282,85 @@ function ReportActionsList({
         ({item: reportAction, index}) => {
             let shouldDisplayNewMarker = false;
 
-            if (!currentUnreadMarker.current) {
+            if (!currentUnreadMarker) {
                 const nextMessage = sortedReportActions[index + 1];
                 const isCurrentMessageUnread = isMessageUnread(reportAction, report.lastReadTime);
                 shouldDisplayNewMarker = isCurrentMessageUnread && !isMessageUnread(nextMessage, report.lastReadTime);
 
-                if (!messageManuallyMarked.read) {
+                if (!messageManuallyMarkedUnread) {
                     shouldDisplayNewMarker = shouldDisplayNewMarker && reportAction.actorAccountID !== Report.getCurrentUserAccountID();
                 }
                 const canDisplayMarker = scrollingVerticalOffset.current < MSG_VISIBLE_THRESHOLD ? reportAction.created < userActiveSince.current : true;
 
-                if (!currentUnreadMarker.current && shouldDisplayNewMarker && canDisplayMarker) {
-                    currentUnreadMarker.current = reportAction.reportActionID;
+                if (!currentUnreadMarker && shouldDisplayNewMarker && canDisplayMarker) {
+                    setCurrentUnreadMarker(reportAction.reportActionID);
                 }
             } else {
-                shouldDisplayNewMarker = reportAction.reportActionID === currentUnreadMarker.current;
+                shouldDisplayNewMarker = reportAction.reportActionID === currentUnreadMarker;
             }
-
-            const shouldDisplayParentAction =
-                reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED &&
-                ReportUtils.isChatThread(report) &&
-                !ReportActionsUtils.isTransactionThread(ReportActionsUtils.getParentReportAction(report));
-            const shouldHideThreadDividerLine = sortedReportActions.length > 1 && sortedReportActions[sortedReportActions.length - 2].reportActionID === currentUnreadMarker.current;
-
-            return shouldDisplayParentAction ? (
-                <ReportActionItemParentAction
-                    shouldHideThreadDividerLine={shouldDisplayParentAction && shouldHideThreadDividerLine}
-                    reportID={report.reportID}
-                    parentReportID={`${report.parentReportID}`}
-                    shouldDisplayNewMarker={shouldDisplayNewMarker}
-                />
-            ) : (
-                <ReportActionItem
-                    shouldHideThreadDividerLine={shouldHideThreadDividerLine}
+            return (
+                <ReportActionsListItemRenderer
+                    reportAction={reportAction}
+                    index={index}
                     report={report}
-                    action={reportAction}
-                    displayAsGroup={ReportActionsUtils.isConsecutiveActionMadeByPreviousActor(sortedReportActions, index)}
-                    shouldDisplayNewMarker={shouldDisplayNewMarker}
-                    shouldShowSubscriptAvatar={
-                        (ReportUtils.isPolicyExpenseChat(report) || ReportUtils.isExpenseReport(report)) &&
-                        _.contains([CONST.REPORT.ACTIONS.TYPE.IOU, CONST.REPORT.ACTIONS.TYPE.REPORTPREVIEW], reportAction.actionName)
-                    }
-                    isMostRecentIOUReportAction={reportAction.reportActionID === mostRecentIOUReportActionID}
                     hasOutstandingIOU={hasOutstandingIOU}
-                    index={index}
+                    sortedReportActions={sortedReportActions}
+                    mostRecentIOUReportActionID={mostRecentIOUReportActionID}
+                    shouldHideThreadDividerLine={shouldHideThreadDividerLine}
+                    shouldDisplayNewMarker={shouldDisplayNewMarker}
                 />
             );
         },
-        [report, hasOutstandingIOU, sortedReportActions, mostRecentIOUReportActionID, messageManuallyMarked],
+        [report, hasOutstandingIOU, sortedReportActions, mostRecentIOUReportActionID, messageManuallyMarkedUnread, shouldHideThreadDividerLine, currentUnreadMarker],
     );
 
     // Native mobile does not render updates flatlist the changes even though component did update called.
     // To notify there something changes we can use extraData prop to flatlist
-    const extraData = [isSmallScreenWidth ? currentUnreadMarker.current : undefined, ReportUtils.isArchivedRoom(report)];
+    const extraData = [isSmallScreenWidth ? currentUnreadMarker : undefined, ReportUtils.isArchivedRoom(report)];
     const hideComposer = ReportUtils.shouldDisableWriteActions(report);
     const shouldShowReportRecipientLocalTime = ReportUtils.canShowReportRecipientLocalTime(personalDetailsList, report, currentUserPersonalDetails.accountID) && !isComposerFullSize;
 
+    const renderFooter = useCallback(() => {
+        // Skip this hook on the first render, as we are not sure if more actions are going to be loaded
+        // Therefore showing the skeleton on footer might be misleading
+        if (firstRenderRef.current) {
+            firstRenderRef.current = false;
+            return null;
+        }
+
+        if (isLoadingMoreReportActions) {
+            return <ReportActionsSkeletonView />;
+        }
+
+        // Make sure the oldest report action loaded is not the first. This is so we do not show the
+        // skeleton view above the created action in a newly generated optimistic chat or one with not
+        // that many comments.
+        const lastReportAction = _.last(sortedReportActions) || {};
+        if (isLoadingReportActions && lastReportAction.actionName !== CONST.REPORT.ACTIONS.TYPE.CREATED) {
+            return <ReportActionsSkeletonView animate={!isOffline} />;
+        }
+
+        return null;
+    }, [isLoadingMoreReportActions, isLoadingReportActions, sortedReportActions, isOffline]);
+
+    const onLayoutInner = useCallback(
+        (event) => {
+            onLayout(event);
+        },
+        [onLayout],
+    );
+
     return (
         <>
             <FloatingMessageCounter
-                isActive={isFloatingMessageCounterVisible && !!currentUnreadMarker.current}
+                isActive={isFloatingMessageCounterVisible && !!currentUnreadMarker}
                 onClick={scrollToBottomAndMarkReportAsRead}
             />
             <Animated.View style={[animatedStyles, styles.flex1, !shouldShowReportRecipientLocalTime && !hideComposer ? styles.pb4 : {}]}>
                 <InvertedFlatList
                     accessibilityLabel={translate('sidebarScreen.listOfChatMessages')}
                     ref={reportScrollManager.ref}
+                    style={styles.overscrollBehaviorContain}
                     data={sortedReportActions}
                     renderItem={renderItem}
                     contentContainerStyle={styles.chatContentScrollView}
@@ -299,31 +369,9 @@ function ReportActionsList({
                     initialNumToRender={initialNumToRender}
                     onEndReached={loadMoreChats}
                     onEndReachedThreshold={0.75}
-                    ListFooterComponent={() => {
-                        if (report.isLoadingMoreReportActions) {
-                            return <ReportActionsSkeletonView containerHeight={CONST.CHAT_SKELETON_VIEW.AVERAGE_ROW_HEIGHT * 3} />;
-                        }
-
-                        // Make sure the oldest report action loaded is not the first. This is so we do not show the
-                        // skeleton view above the created action in a newly generated optimistic chat or one with not
-                        // that many comments.
-                        const lastReportAction = _.last(sortedReportActions) || {};
-                        if (report.isLoadingReportActions && lastReportAction.actionName !== CONST.REPORT.ACTIONS.TYPE.CREATED) {
-                            return (
-                                <ReportActionsSkeletonView
-                                    containerHeight={skeletonViewHeight}
-                                    animate={!isOffline}
-                                />
-                            );
-                        }
-
-                        return null;
-                    }}
+                    ListFooterComponent={renderFooter}
                     keyboardShouldPersistTaps="handled"
-                    onLayout={(event) => {
-                        setSkeletonViewHeight(event.nativeEvent.layout.height);
-                        onLayout(event);
-                    }}
+                    onLayout={onLayoutInner}
                     onScroll={trackVerticalScrolling}
                     extraData={extraData}
                 />
diff --git a/src/pages/home/report/ReportActionsListItemRenderer.js b/src/pages/home/report/ReportActionsListItemRenderer.js
new file mode 100644
index 000000000000..f70714076ad2
--- /dev/null
+++ b/src/pages/home/report/ReportActionsListItemRenderer.js
@@ -0,0 +1,87 @@
+import PropTypes from 'prop-types';
+import React, {memo} from 'react';
+import _ from 'underscore';
+import CONST from '../../../CONST';
+import * as ReportActionsUtils from '../../../libs/ReportActionsUtils';
+import * as ReportUtils from '../../../libs/ReportUtils';
+import reportPropTypes from '../../reportPropTypes';
+import ReportActionItem from './ReportActionItem';
+import ReportActionItemParentAction from './ReportActionItemParentAction';
+import reportActionPropTypes from './reportActionPropTypes';
+
+const propTypes = {
+    /** All the data of the action item */
+    reportAction: PropTypes.shape(reportActionPropTypes).isRequired,
+
+    /** Position index of the report action in the overall report FlatList view */
+    index: PropTypes.number.isRequired,
+
+    /** Report for this action */
+    report: reportPropTypes.isRequired,
+
+    /** Whether the option has an outstanding IOU */
+    hasOutstandingIOU: PropTypes.bool,
+
+    /** Sorted actions prepared for display */
+    sortedReportActions: PropTypes.arrayOf(PropTypes.shape(reportActionPropTypes)).isRequired,
+
+    /** The ID of the most recent IOU report action connected with the shown report */
+    mostRecentIOUReportActionID: PropTypes.string,
+
+    /** If the thread divider line should be hidden */
+    shouldHideThreadDividerLine: PropTypes.bool.isRequired,
+
+    /** Should we display the new marker on top of the comment? */
+    shouldDisplayNewMarker: PropTypes.bool.isRequired,
+};
+
+const defaultProps = {
+    mostRecentIOUReportActionID: '',
+    hasOutstandingIOU: false,
+};
+
+function ReportActionsListItemRenderer({
+    reportAction,
+    index,
+    report,
+    hasOutstandingIOU,
+    sortedReportActions,
+    mostRecentIOUReportActionID,
+    shouldHideThreadDividerLine,
+    shouldDisplayNewMarker,
+}) {
+    const shouldDisplayParentAction =
+        reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED &&
+        ReportUtils.isChatThread(report) &&
+        !ReportActionsUtils.isTransactionThread(ReportActionsUtils.getParentReportAction(report));
+
+    return shouldDisplayParentAction ? (
+        <ReportActionItemParentAction
+            shouldHideThreadDividerLine={shouldDisplayParentAction && shouldHideThreadDividerLine}
+            reportID={report.reportID}
+            parentReportID={`${report.parentReportID}`}
+            shouldDisplayNewMarker={shouldDisplayNewMarker}
+        />
+    ) : (
+        <ReportActionItem
+            shouldHideThreadDividerLine={shouldHideThreadDividerLine}
+            report={report}
+            action={reportAction}
+            displayAsGroup={ReportActionsUtils.isConsecutiveActionMadeByPreviousActor(sortedReportActions, index)}
+            shouldDisplayNewMarker={shouldDisplayNewMarker}
+            shouldShowSubscriptAvatar={
+                (ReportUtils.isPolicyExpenseChat(report) || ReportUtils.isExpenseReport(report)) &&
+                _.contains([CONST.REPORT.ACTIONS.TYPE.IOU, CONST.REPORT.ACTIONS.TYPE.REPORTPREVIEW], reportAction.actionName)
+            }
+            isMostRecentIOUReportAction={reportAction.reportActionID === mostRecentIOUReportActionID}
+            hasOutstandingIOU={hasOutstandingIOU}
+            index={index}
+        />
+    );
+}
+
+ReportActionsListItemRenderer.propTypes = propTypes;
+ReportActionsListItemRenderer.defaultProps = defaultProps;
+ReportActionsListItemRenderer.displayName = 'ReportActionsListItemRenderer';
+
+export default memo(ReportActionsListItemRenderer);
diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
index a694c4996438..f58c6644cd47 100755
--- a/src/pages/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -19,7 +19,7 @@ import * as ReportActionsUtils from '../../../libs/ReportActionsUtils';
 import reportPropTypes from '../../reportPropTypes';
 import PopoverReactionList from './ReactionList/PopoverReactionList';
 import getIsReportFullyVisible from '../../../libs/getIsReportFullyVisible';
-import ReportScreenContext from '../ReportScreenContext';
+import {ReactionListContext} from '../ReportScreenContext';
 
 const propTypes = {
     /** The report currently being looked at */
@@ -28,6 +28,12 @@ const propTypes = {
     /** Array of report actions for this report */
     reportActions: PropTypes.arrayOf(PropTypes.shape(reportActionPropTypes)),
 
+    /** The report metadata loading states */
+    isLoadingReportActions: PropTypes.bool,
+
+    /** The report actions are loading more data */
+    isLoadingMoreReportActions: PropTypes.bool,
+
     /** Whether the composer is full size */
     /* eslint-disable-next-line react/no-unused-prop-types */
     isComposerFullSize: PropTypes.bool.isRequired,
@@ -51,13 +57,13 @@ const propTypes = {
 const defaultProps = {
     reportActions: [],
     policy: null,
+    isLoadingReportActions: false,
+    isLoadingMoreReportActions: false,
 };
 
 function ReportActionsView(props) {
-    const context = useContext(ReportScreenContext);
-
     useCopySelectionHelper();
-
+    const reactionListRef = useContext(ReactionListContext);
     const didLayout = useRef(false);
     const didSubscribeToReportTypingEvents = useRef(false);
     const hasCachedActions = useRef(_.size(props.reportActions) > 0);
@@ -138,7 +144,7 @@ function ReportActionsView(props) {
      */
     const loadMoreChats = () => {
         // Only fetch more if we are not already fetching so that we don't initiate duplicate requests.
-        if (props.report.isLoadingMoreReportActions) {
+        if (props.isLoadingMoreReportActions) {
             return;
         }
 
@@ -185,11 +191,12 @@ function ReportActionsView(props) {
                 onLayout={recordTimeToMeasureItemLayout}
                 sortedReportActions={props.reportActions}
                 mostRecentIOUReportActionID={mostRecentIOUReportActionID.current}
-                isLoadingMoreReportActions={props.report.isLoadingMoreReportActions}
+                isLoadingReportActions={props.isLoadingReportActions}
+                isLoadingMoreReportActions={props.isLoadingMoreReportActions}
                 loadMoreChats={loadMoreChats}
                 policy={props.policy}
             />
-            <PopoverReactionList ref={context.reactionListRef} />
+            <PopoverReactionList ref={reactionListRef} />
         </>
     );
 }
@@ -215,11 +222,11 @@ function arePropsEqual(oldProps, newProps) {
         return false;
     }
 
-    if (oldProps.report.isLoadingMoreReportActions !== newProps.report.isLoadingMoreReportActions) {
+    if (oldProps.isLoadingMoreReportActions !== newProps.isLoadingMoreReportActions) {
         return false;
     }
 
-    if (oldProps.report.isLoadingReportActions !== newProps.report.isLoadingReportActions) {
+    if (oldProps.isLoadingReportActions !== newProps.isLoadingReportActions) {
         return false;
     }
 
diff --git a/src/pages/home/report/ReportAttachments.js b/src/pages/home/report/ReportAttachments.js
index c8b5dd1ae685..4146be0d3971 100644
--- a/src/pages/home/report/ReportAttachments.js
+++ b/src/pages/home/report/ReportAttachments.js
@@ -32,7 +32,7 @@ function ReportAttachments(props) {
             source={source}
             onModalHide={() => Navigation.dismissModal(reportID)}
             onCarouselAttachmentChange={(attachment) => {
-                const route = ROUTES.getReportAttachmentRoute(reportID, attachment.source);
+                const route = ROUTES.REPORT_ATTACHMENTS.getRoute(reportID, attachment.source);
                 Navigation.navigate(route);
             }}
         />
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/report/ReportFooter.js b/src/pages/home/report/ReportFooter.js
index 8d92c09b7a6e..51a8490162e5 100644
--- a/src/pages/home/report/ReportFooter.js
+++ b/src/pages/home/report/ReportFooter.js
@@ -11,6 +11,7 @@ import ArchivedReportFooter from '../../../components/ArchivedReportFooter';
 import compose from '../../../libs/compose';
 import ONYXKEYS from '../../../ONYXKEYS';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../../../components/withWindowDimensions';
+import useNetwork from '../../../hooks/useNetwork';
 import styles from '../../../styles/styles';
 import variables from '../../../styles/variables';
 import reportActionPropTypes from './reportActionPropTypes';
@@ -25,9 +26,6 @@ const propTypes = {
     /** Report actions for the current report */
     reportActions: PropTypes.arrayOf(PropTypes.shape(reportActionPropTypes)),
 
-    /** Offline status */
-    isOffline: PropTypes.bool.isRequired,
-
     /** Callback fired when the comment is submitted */
     onSubmitComment: PropTypes.func,
 
@@ -53,7 +51,8 @@ const defaultProps = {
 };
 
 function ReportFooter(props) {
-    const chatFooterStyles = {...styles.chatFooter, minHeight: !props.isOffline ? CONST.CHAT_FOOTER_MIN_HEIGHT : 0};
+    const {isOffline} = useNetwork();
+    const chatFooterStyles = {...styles.chatFooter, minHeight: !isOffline ? CONST.CHAT_FOOTER_MIN_HEIGHT : 0};
     const isArchivedRoom = ReportUtils.isArchivedRoom(props.report);
     const isAnonymousUser = Session.isAnonymousUser();
 
@@ -102,5 +101,6 @@ export default compose(
     withWindowDimensions,
     withOnyx({
         shouldShowComposeInput: {key: ONYXKEYS.SHOULD_SHOW_COMPOSE_INPUT},
+        initialValue: false,
     }),
 )(ReportFooter);
diff --git a/src/pages/home/report/ReportTypingIndicator.js b/src/pages/home/report/ReportTypingIndicator.js
index 4de649c7eb49..db97f712d65f 100755
--- a/src/pages/home/report/ReportTypingIndicator.js
+++ b/src/pages/home/report/ReportTypingIndicator.js
@@ -74,6 +74,7 @@ export default compose(
     withOnyx({
         userTypingStatuses: {
             key: ({reportID}) => `${ONYXKEYS.COLLECTION.REPORT_USER_IS_TYPING}${reportID}`,
+            initialValue: {},
         },
     }),
 )(ReportTypingIndicator);
diff --git a/src/pages/home/report/reportActionPropTypes.js b/src/pages/home/report/reportActionPropTypes.js
index e0c3aebe718c..4d4809cd781f 100644
--- a/src/pages/home/report/reportActionPropTypes.js
+++ b/src/pages/home/report/reportActionPropTypes.js
@@ -23,9 +23,6 @@ export default {
         IOUTransactionID: PropTypes.string,
     }),
 
-    /** Whether we have received a response back from the server */
-    isLoading: PropTypes.bool,
-
     /** Error message that's come back from the server. */
     error: PropTypes.string,
 
diff --git a/src/pages/home/report/withReportAndReportActionOrNotFound.js b/src/pages/home/report/withReportAndReportActionOrNotFound.js
index 9bf3e73e761c..b4346504b327 100644
--- a/src/pages/home/report/withReportAndReportActionOrNotFound.js
+++ b/src/pages/home/report/withReportAndReportActionOrNotFound.js
@@ -6,6 +6,7 @@ import getComponentDisplayName from '../../../libs/getComponentDisplayName';
 import NotFoundPage from '../../ErrorPage/NotFoundPage';
 import ONYXKEYS from '../../../ONYXKEYS';
 import reportPropTypes from '../../reportPropTypes';
+import reportMetadataPropTypes from '../../reportMetadataPropTypes';
 import reportActionPropTypes from './reportActionPropTypes';
 import FullscreenLoadingIndicator from '../../../components/FullscreenLoadingIndicator';
 import * as ReportUtils from '../../../libs/ReportUtils';
@@ -23,6 +24,9 @@ export default function (WrappedComponent) {
         /** The report currently being looked at */
         report: reportPropTypes,
 
+        /** The report metadata */
+        reportMetadata: reportMetadataPropTypes,
+
         /** Array of report actions for this report */
         reportActions: PropTypes.shape(reportActionPropTypes),
 
@@ -62,6 +66,10 @@ export default function (WrappedComponent) {
         forwardedRef: () => {},
         reportActions: {},
         report: {},
+        reportMetadata: {
+            isLoadingReportActions: false,
+            isLoadingMoreReportActions: false,
+        },
         policies: {},
         betas: [],
         isLoadingReportData: true,
@@ -94,7 +102,7 @@ export default function (WrappedComponent) {
 
         // Perform all the loading checks
         const isLoadingReport = props.isLoadingReportData && (_.isEmpty(props.report) || !props.report.reportID);
-        const isLoadingReportAction = _.isEmpty(props.reportActions) || (props.report.isLoadingReportActions && _.isEmpty(getReportAction()));
+        const isLoadingReportAction = _.isEmpty(props.reportActions) || (props.reportMetadata.isLoadingReportActions && _.isEmpty(getReportAction()));
         const shouldHideReport = !isLoadingReport && (_.isEmpty(props.report) || !props.report.reportID || !ReportUtils.canAccessReport(props.report, props.policies, props.betas));
 
         if ((isLoadingReport || isLoadingReportAction) && !shouldHideReport) {
@@ -135,6 +143,9 @@ export default function (WrappedComponent) {
             report: {
                 key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID}`,
             },
+            reportMetadata: {
+                key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_METADATA}${route.params.reportID}`,
+            },
             isLoadingReportData: {
                 key: ONYXKEYS.IS_LOADING_REPORT_DATA,
             },
diff --git a/src/pages/home/sidebar/PressableAvatarWithIndicator.js b/src/pages/home/sidebar/PressableAvatarWithIndicator.js
index ef6e663ce705..7b240c108e4e 100644
--- a/src/pages/home/sidebar/PressableAvatarWithIndicator.js
+++ b/src/pages/home/sidebar/PressableAvatarWithIndicator.js
@@ -52,6 +52,7 @@ function PressableAvatarWithIndicator({isCreateMenuOpen, currentUserPersonalDeta
                 <AvatarWithIndicator
                     source={UserUtils.getAvatar(currentUserPersonalDetails.avatar, currentUserPersonalDetails.accountID)}
                     tooltipText={translate('common.settings')}
+                    fallbackIcon={currentUserPersonalDetails.fallbackIcon}
                 />
             </OfflineWithFeedback>
         </PressableWithoutFeedback>
diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index c91509e62aba..984654c6b506 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -1,6 +1,6 @@
 /* eslint-disable rulesdir/onyx-props-must-have-default */
 import React from 'react';
-import {View} from 'react-native';
+import {View, InteractionManager} from 'react-native';
 import _ from 'underscore';
 import PropTypes from 'prop-types';
 import styles from '../../../styles/styles';
@@ -77,6 +77,13 @@ class SidebarLinks extends React.PureComponent {
         SidebarUtils.setIsSidebarLoadedReady();
         this.isSidebarLoaded = true;
 
+        // Eagerly set the locale on date-fns, it helps navigating to the report screen faster
+        InteractionManager.runAfterInteractions(() => {
+            requestAnimationFrame(() => {
+                this.props.updateLocale();
+            });
+        });
+
         let modal = {};
         this.unsubscribeOnyxModal = onyxSubscribe({
             key: ONYXKEYS.MODAL,
@@ -134,14 +141,10 @@ class SidebarLinks extends React.PureComponent {
         // or when clicking the active LHN row on large screens
         // or when continuously clicking different LHNs, only apply to small screen
         // since getTopmostReportId always returns on other devices
-        if (
-            this.props.isCreateMenuOpen ||
-            (!this.props.isSmallScreenWidth && this.props.isActiveReport(option.reportID)) ||
-            (this.props.isSmallScreenWidth && Navigation.getTopmostReportId())
-        ) {
+        if (this.props.isCreateMenuOpen || option.reportID === Navigation.getTopmostReportId() || (this.props.isSmallScreenWidth && this.props.isActiveReport(option.reportID))) {
             return;
         }
-        Navigation.navigate(ROUTES.getReportRoute(option.reportID));
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(option.reportID));
         this.props.onLinkClick();
     }
 
@@ -157,7 +160,7 @@ class SidebarLinks extends React.PureComponent {
                     <Header
                         title={
                             <LogoComponent
-                                fill={defaultTheme.textLight}
+                                fill={defaultTheme.text}
                                 width={variables.lhnLogoWidth}
                                 height={variables.lhnLogoHeight}
                             />
@@ -195,4 +198,5 @@ class SidebarLinks extends React.PureComponent {
 SidebarLinks.propTypes = propTypes;
 SidebarLinks.defaultProps = defaultProps;
 export default compose(withLocalize, withWindowDimensions)(SidebarLinks);
+
 export {basePropTypes};
diff --git a/src/pages/home/sidebar/SidebarLinksData.js b/src/pages/home/sidebar/SidebarLinksData.js
index 5d0a21038d68..243ba24cdd00 100644
--- a/src/pages/home/sidebar/SidebarLinksData.js
+++ b/src/pages/home/sidebar/SidebarLinksData.js
@@ -69,17 +69,29 @@ function SidebarLinksData({isFocused, allReportActions, betas, chatReports, curr
     const reportIDsRef = useRef(null);
     const isLoading = SessionUtils.didUserLogInDuringSession() && isLoadingReportData;
     const optionListItems = useMemo(() => {
-        const reportIDs = SidebarUtils.getOrderedReportIDs(currentReportID, chatReports, betas, policies, priorityMode, allReportActions);
+        const reportIDs = SidebarUtils.getOrderedReportIDs(null, chatReports, betas, policies, priorityMode, allReportActions);
         if (deepEqual(reportIDsRef.current, reportIDs)) {
             return reportIDsRef.current;
         }
 
         // We need to update existing reports only once while loading because they are updated several times during loading and causes this regression: https://github.com/Expensify/App/issues/24596#issuecomment-1681679531
-        if (!isLoading || !reportIDsRef.current || (_.isEmpty(reportIDsRef.current) && currentReportID)) {
+        if (!isLoading || !reportIDsRef.current) {
             reportIDsRef.current = reportIDs;
         }
         return reportIDsRef.current || [];
-    }, [allReportActions, betas, chatReports, currentReportID, policies, priorityMode, isLoading]);
+    }, [allReportActions, betas, chatReports, policies, priorityMode, isLoading]);
+
+    // We need to make sure the current report is in the list of reports, but we do not want
+    // to have to re-generate the list every time the currentReportID changes. To do that
+    // we first generate the list as if there was no current report, then here we check if
+    // the current report is missing from the list, which should very rarely happen. In this
+    // case we re-generate the list a 2nd time with the current report included.
+    const optionListItemsWithCurrentReport = useMemo(() => {
+        if (currentReportID && !_.contains(optionListItems, currentReportID)) {
+            return SidebarUtils.getOrderedReportIDs(currentReportID, chatReports, betas, policies, priorityMode, allReportActions);
+        }
+        return optionListItems;
+    }, [currentReportID, optionListItems, chatReports, betas, policies, priorityMode, allReportActions]);
 
     const currentReportIDRef = useRef(currentReportID);
     currentReportIDRef.current = currentReportID;
@@ -100,7 +112,7 @@ function SidebarLinksData({isFocused, allReportActions, betas, chatReports, curr
                 // Data props:
                 isActiveReport={isActiveReport}
                 isLoading={isLoading}
-                optionListItems={optionListItems}
+                optionListItems={optionListItemsWithCurrentReport}
             />
         </View>
     );
diff --git a/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.js b/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.js
index 3d54306b6248..bc4d28fdf09f 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 : {}]}
+            testID={BaseSidebarScreen.displayName}
         >
             {({insets}) => (
                 <>
diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
index a75a03f7a517..e9ede2c9a89a 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
@@ -5,14 +5,12 @@ import lodashGet from 'lodash/get';
 import {View} from 'react-native';
 import styles from '../../../../styles/styles';
 import * as Expensicons from '../../../../components/Icon/Expensicons';
-import * as Browser from '../../../../libs/Browser';
 import Navigation from '../../../../libs/Navigation/Navigation';
 import ROUTES from '../../../../ROUTES';
 import NAVIGATORS from '../../../../NAVIGATORS';
 import SCREENS from '../../../../SCREENS';
 import Permissions from '../../../../libs/Permissions';
 import * as Policy from '../../../../libs/actions/Policy';
-import * as PolicyUtils from '../../../../libs/PolicyUtils';
 import PopoverMenu from '../../../../components/PopoverMenu';
 import CONST from '../../../../CONST';
 import FloatingActionButton from '../../../../components/FloatingActionButton';
@@ -62,21 +60,8 @@ const propTypes = {
     /** Indicated whether the report data is loading */
     isLoading: PropTypes.bool,
 
-    /** For first time users, whether the download app banner should show */
-    shouldShowDownloadAppBanner: PropTypes.bool,
-
     /** Forwarded ref to FloatingActionButtonAndPopover */
     innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
-
-    /** Information about any currently running demos */
-    demoInfo: PropTypes.shape({
-        saastr: PropTypes.shape({
-            isBeginningDemo: PropTypes.bool,
-        }),
-        sbe: PropTypes.shape({
-            isBeginningDemo: PropTypes.bool,
-        }),
-    }),
 };
 const defaultProps = {
     onHideCreateMenu: () => {},
@@ -85,8 +70,6 @@ const defaultProps = {
     betas: [],
     isLoading: false,
     innerRef: null,
-    shouldShowDownloadAppBanner: true,
-    demoInfo: {},
 };
 
 /**
@@ -169,15 +152,9 @@ function FloatingActionButtonAndPopover(props) {
         if (currentRoute && ![NAVIGATORS.CENTRAL_PANE_NAVIGATOR, SCREENS.HOME].includes(currentRoute.name)) {
             return;
         }
-        // Avoid rendering the create menu for first-time users until they have dismissed the download app banner (mWeb only).
-        if (props.shouldShowDownloadAppBanner && Browser.isMobile()) {
-            return;
-        }
-        if (lodashGet(props.demoInfo, 'saastr.isBeginningDemo', false) || lodashGet(props.demoInfo, 'sbe.isBeginningDemo', false)) {
-            return;
-        }
         Welcome.show({routes, showCreateMenu});
-    }, [props.shouldShowDownloadAppBanner, props.navigation, showCreateMenu, props.demoInfo]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
 
     useEffect(() => {
         if (!didScreenBecomeInactive()) {
@@ -194,8 +171,6 @@ function FloatingActionButtonAndPopover(props) {
         },
     }));
 
-    const workspaces = PolicyUtils.getActivePolicies(props.allPolicies);
-
     return (
         <View>
             <PopoverMenu
@@ -207,23 +182,9 @@ function FloatingActionButtonAndPopover(props) {
                 menuItems={[
                     {
                         icon: Expensicons.ChatBubble,
-                        text: props.translate('sidebarScreen.newChat'),
-                        onSelected: () => interceptAnonymousUser(() => Navigation.navigate(ROUTES.NEW_CHAT)),
-                    },
-                    {
-                        icon: Expensicons.Users,
-                        text: props.translate('sidebarScreen.newGroup'),
-                        onSelected: () => interceptAnonymousUser(() => Navigation.navigate(ROUTES.NEW_GROUP)),
+                        text: props.translate('sidebarScreen.fabNewChat'),
+                        onSelected: () => interceptAnonymousUser(() => Navigation.navigate(ROUTES.NEW)),
                     },
-                    ...(Permissions.canUsePolicyRooms(props.betas) && workspaces.length
-                        ? [
-                              {
-                                  icon: Expensicons.Hashtag,
-                                  text: props.translate('sidebarScreen.newRoom'),
-                                  onSelected: () => interceptAnonymousUser(() => Navigation.navigate(ROUTES.WORKSPACE_NEW_ROOM)),
-                              },
-                          ]
-                        : []),
                     ...(Permissions.canUseIOUSend(props.betas)
                         ? [
                               {
@@ -238,11 +199,6 @@ function FloatingActionButtonAndPopover(props) {
                         text: props.translate('iou.requestMoney'),
                         onSelected: () => interceptAnonymousUser(() => IOU.startMoneyRequest(CONST.IOU.MONEY_REQUEST_TYPE.REQUEST)),
                     },
-                    {
-                        icon: Expensicons.Receipt,
-                        text: props.translate('iou.splitBill'),
-                        onSelected: () => interceptAnonymousUser(() => IOU.startMoneyRequest(CONST.IOU.MONEY_REQUEST_TYPE.SPLIT)),
-                    },
                     ...(Permissions.canUseTasks(props.betas)
                         ? [
                               {
@@ -269,7 +225,7 @@ function FloatingActionButtonAndPopover(props) {
                 anchorRef={anchorRef}
             />
             <FloatingActionButton
-                accessibilityLabel={props.translate('sidebarScreen.fabNewChat')}
+                accessibilityLabel={props.translate('sidebarScreen.fabNewChatExplained')}
                 accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
                 isActive={isCreateMenuActive}
                 ref={anchorRef}
@@ -305,12 +261,6 @@ export default compose(
         isLoading: {
             key: ONYXKEYS.IS_LOADING_REPORT_DATA,
         },
-        shouldShowDownloadAppBanner: {
-            key: ONYXKEYS.SHOW_DOWNLOAD_APP_BANNER,
-        },
-        demoInfo: {
-            key: ONYXKEYS.DEMO_INFO,
-        },
     }),
 )(
     forwardRef((props, ref) => (
diff --git a/src/pages/home/sidebar/SidebarScreen/index.js b/src/pages/home/sidebar/SidebarScreen/index.js
index 705d9d1e2d08..08888352ddff 100755
--- a/src/pages/home/sidebar/SidebarScreen/index.js
+++ b/src/pages/home/sidebar/SidebarScreen/index.js
@@ -23,18 +23,28 @@ function SidebarScreen(props) {
         }, []),
     );
 
+    /**
+     * Method to hide popover when dragover.
+     */
+    const hidePopoverOnDragOver = useCallback(() => {
+        if (!popoverModal.current) {
+            return;
+        }
+        popoverModal.current.hideCreateMenu();
+    }, []);
+
     /**
      * Method create event listener
      */
     const createDragoverListener = () => {
-        document.addEventListener('dragover', () => popoverModal.current.hideCreateMenu());
+        document.addEventListener('dragover', hidePopoverOnDragOver);
     };
 
     /**
      * Method remove event listener.
      */
     const removeDragoverListener = () => {
-        document.removeEventListener('dragover', () => popoverModal.current.hideCreateMenu());
+        document.removeEventListener('dragover', hidePopoverOnDragOver);
     };
 
     return (
diff --git a/src/pages/iou/IOUCurrencySelection.js b/src/pages/iou/IOUCurrencySelection.js
index caf008939519..e8c5cd6b3a92 100644
--- a/src/pages/iou/IOUCurrencySelection.js
+++ b/src/pages/iou/IOUCurrencySelection.js
@@ -1,4 +1,4 @@
-import React, {useState, useMemo, useCallback} from 'react';
+import React, {useState, useMemo, useCallback, useRef} from 'react';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
@@ -70,6 +70,7 @@ const defaultProps = {
 
 function IOUCurrencySelection(props) {
     const [searchValue, setSearchValue] = useState('');
+    const optionsSelectorRef = useRef();
     const selectedCurrencyCode = lodashGet(props.route, 'params.currency', props.iou.currency, CONST.CURRENCY.USD);
 
     const iouType = lodashGet(props.route, 'params.iouType', CONST.IOU.MONEY_REQUEST_TYPE.REQUEST);
@@ -82,7 +83,7 @@ function IOUCurrencySelection(props) {
             // Navigating to "backTo" will result in forward navigation instead, causing disruption to the currency selection.
             // To prevent any negative experience, we have made the decision to simply close the currency selection page.
             if (_.isEmpty(backTo) || props.navigation.getState().routes.length === 1) {
-                Navigation.goBack();
+                Navigation.goBack(ROUTES.HOME);
             } else {
                 Navigation.navigate(`${props.route.params.backTo}?currency=${option.currencyCode}`);
             }
@@ -95,6 +96,7 @@ function IOUCurrencySelection(props) {
         const currencyOptions = _.map(currencyList, (currencyInfo, currencyCode) => {
             const isSelectedCurrency = currencyCode === selectedCurrencyCode;
             return {
+                currencyName: currencyInfo.name,
                 text: `${currencyCode} - ${CurrencyUtils.getLocalizedCurrencySymbol(currencyCode)}`,
                 currencyCode,
                 keyForList: currencyCode,
@@ -103,8 +105,8 @@ function IOUCurrencySelection(props) {
             };
         });
 
-        const searchRegex = new RegExp(Str.escapeForRegExp(searchValue), 'i');
-        const filteredCurrencies = _.filter(currencyOptions, (currencyOption) => searchRegex.test(currencyOption.text));
+        const searchRegex = new RegExp(Str.escapeForRegExp(searchValue.trim()), 'i');
+        const filteredCurrencies = _.filter(currencyOptions, (currencyOption) => searchRegex.test(currencyOption.text) || searchRegex.test(currencyOption.currencyName));
         const isEmpty = searchValue.trim() && !filteredCurrencies.length;
 
         return {
@@ -127,12 +129,16 @@ function IOUCurrencySelection(props) {
     }, [currencyList, searchValue, selectedCurrencyCode, translate]);
 
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            onEntryTransitionEnd={() => optionsSelectorRef.current && optionsSelectorRef.current.focus()}
+            testID={IOUCurrencySelection.displayName}
+        >
             {({safeAreaPaddingBottomStyle}) => (
                 <>
                     <HeaderWithBackButton
                         title={translate('iOUCurrencySelection.selectCurrency')}
-                        onBackButtonPress={() => Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType, reportID))}
+                        onBackButtonPress={() => Navigation.goBack(ROUTES.MONEY_REQUEST.getRoute(iouType, reportID))}
                     />
                     <OptionsSelector
                         sections={sections}
@@ -144,6 +150,8 @@ function IOUCurrencySelection(props) {
                         safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
                         initiallyFocusedOptionKey={initiallyFocusedOptionKey}
                         shouldHaveOptionSeparator
+                        autoFocus={false}
+                        ref={optionsSelectorRef}
                     />
                 </>
             )}
diff --git a/src/pages/iou/MoneyRequestCategoryPage.js b/src/pages/iou/MoneyRequestCategoryPage.js
index 80b88a762609..5284b785304f 100644
--- a/src/pages/iou/MoneyRequestCategoryPage.js
+++ b/src/pages/iou/MoneyRequestCategoryPage.js
@@ -10,6 +10,8 @@ import HeaderWithBackButton from '../../components/HeaderWithBackButton';
 import CategoryPicker from '../../components/CategoryPicker';
 import ONYXKEYS from '../../ONYXKEYS';
 import reportPropTypes from '../reportPropTypes';
+import * as IOU from '../../libs/actions/IOU';
+import {iouPropTypes, iouDefaultProps} from './propTypes';
 
 const propTypes = {
     /** Navigation route context info provided by react navigation */
@@ -24,28 +26,44 @@ const propTypes = {
         }),
     }).isRequired,
 
+    /* Onyx Props */
     /** The report currently being used */
     report: reportPropTypes,
+
+    /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
+    iou: iouPropTypes,
 };
 
 const defaultProps = {
     report: {},
+    iou: iouDefaultProps,
 };
 
-function MoneyRequestCategoryPage({route, report}) {
+function MoneyRequestCategoryPage({route, report, iou}) {
     const {translate} = useLocalize();
 
     const reportID = lodashGet(route, 'params.reportID', '');
     const iouType = lodashGet(route, 'params.iouType', '');
 
     const navigateBack = () => {
-        Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
+        Navigation.goBack(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(iouType, reportID));
+    };
+
+    const updateCategory = (category) => {
+        if (category.searchText === iou.category) {
+            IOU.resetMoneyRequestCategory();
+        } else {
+            IOU.setMoneyRequestCategory(category.searchText);
+        }
+
+        Navigation.goBack(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(iouType, reportID));
     };
 
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
+            testID={MoneyRequestCategoryPage.displayName}
         >
             <HeaderWithBackButton
                 title={translate('common.category')}
@@ -53,9 +71,9 @@ function MoneyRequestCategoryPage({route, report}) {
             />
 
             <CategoryPicker
+                selectedCategory={iou.category}
                 policyID={report.policyID}
-                reportID={reportID}
-                iouType={iouType}
+                onSubmit={updateCategory}
             />
         </ScreenWrapper>
     );
@@ -69,4 +87,7 @@ export default withOnyx({
     report: {
         key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '')}`,
     },
+    iou: {
+        key: ONYXKEYS.IOU,
+    },
 })(MoneyRequestCategoryPage);
diff --git a/src/pages/iou/MoneyRequestDatePage.js b/src/pages/iou/MoneyRequestDatePage.js
index c6f2e0d40922..65654aa8098a 100644
--- a/src/pages/iou/MoneyRequestDatePage.js
+++ b/src/pages/iou/MoneyRequestDatePage.js
@@ -62,12 +62,12 @@ function MoneyRequestDatePage({iou, route, selectedTab}) {
         }
 
         if (!isDistanceRequest && (_.isEmpty(iou.participants) || (iou.amount === 0 && !iou.receiptPath) || shouldReset)) {
-            Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType, reportID), true);
+            Navigation.goBack(ROUTES.MONEY_REQUEST.getRoute(iouType, reportID), true);
         }
     }, [iou.id, iou.participants, iou.amount, iou.receiptPath, iouType, reportID, isDistanceRequest]);
 
     function navigateBack() {
-        Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
+        Navigation.goBack(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(iouType, reportID));
     }
 
     /**
@@ -85,6 +85,7 @@ function MoneyRequestDatePage({iou, route, selectedTab}) {
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
+            testID={MoneyRequestDatePage.displayName}
         >
             <HeaderWithBackButton
                 title={translate('common.date')}
@@ -110,12 +111,13 @@ function MoneyRequestDatePage({iou, route, selectedTab}) {
 
 MoneyRequestDatePage.propTypes = propTypes;
 MoneyRequestDatePage.defaultProps = defaultProps;
+MoneyRequestDatePage.displayName = 'MoneyRequestDatePage';
 
 export default withOnyx({
     iou: {
         key: ONYXKEYS.IOU,
     },
     selectedTab: {
-        key: `${ONYXKEYS.SELECTED_TAB}_${CONST.TAB.RECEIPT_TAB_ID}`,
+        key: `${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.RECEIPT_TAB_ID}`,
     },
 })(MoneyRequestDatePage);
diff --git a/src/pages/iou/MoneyRequestDescriptionPage.js b/src/pages/iou/MoneyRequestDescriptionPage.js
index 72e1270f1fcb..6570cffb58d4 100644
--- a/src/pages/iou/MoneyRequestDescriptionPage.js
+++ b/src/pages/iou/MoneyRequestDescriptionPage.js
@@ -1,6 +1,7 @@
-import React, {useEffect, useRef} from 'react';
+import React, {useEffect, useRef, useCallback} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
+import {useFocusEffect} from '@react-navigation/native';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
@@ -17,7 +18,7 @@ import * as IOU from '../../libs/actions/IOU';
 import * as MoneyRequestUtils from '../../libs/MoneyRequestUtils';
 import CONST from '../../CONST';
 import useLocalize from '../../hooks/useLocalize';
-import focusAndUpdateMultilineInputRange from '../../libs/focusAndUpdateMultilineInputRange';
+import updateMultilineInputRange from '../../libs/UpdateMultilineInputRange';
 import * as Browser from '../../libs/Browser';
 
 const propTypes = {
@@ -54,10 +55,27 @@ const defaultProps = {
 function MoneyRequestDescriptionPage({iou, route, selectedTab}) {
     const {translate} = useLocalize();
     const inputRef = useRef(null);
+    const focusTimeoutRef = useRef(null);
     const iouType = lodashGet(route, 'params.iouType', '');
     const reportID = lodashGet(route, 'params.reportID', '');
     const isDistanceRequest = MoneyRequestUtils.isDistanceRequest(iouType, selectedTab);
 
+    useFocusEffect(
+        useCallback(() => {
+            focusTimeoutRef.current = setTimeout(() => {
+                if (inputRef.current) {
+                    inputRef.current.focus();
+                }
+                return () => {
+                    if (!focusTimeoutRef.current) {
+                        return;
+                    }
+                    clearTimeout(focusTimeoutRef.current);
+                };
+            }, CONST.ANIMATED_TRANSITION);
+        }, []),
+    );
+
     useEffect(() => {
         const moneyRequestId = `${iouType}${reportID}`;
         const shouldReset = iou.id !== moneyRequestId;
@@ -66,12 +84,12 @@ function MoneyRequestDescriptionPage({iou, route, selectedTab}) {
         }
 
         if (!isDistanceRequest && (_.isEmpty(iou.participants) || (iou.amount === 0 && !iou.receiptPath) || shouldReset)) {
-            Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType, reportID), true);
+            Navigation.goBack(ROUTES.MONEY_REQUEST.getRoute(iouType, reportID), true);
         }
     }, [iou.id, iou.participants, iou.amount, iou.receiptPath, iouType, reportID, isDistanceRequest]);
 
     function navigateBack() {
-        Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
+        Navigation.goBack(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(iouType, reportID));
     }
 
     /**
@@ -89,47 +107,56 @@ function MoneyRequestDescriptionPage({iou, route, selectedTab}) {
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
-            onEntryTransitionEnd={() => focusAndUpdateMultilineInputRange(inputRef.current)}
+            testID={MoneyRequestDescriptionPage.displayName}
         >
-            <HeaderWithBackButton
-                title={translate('common.description')}
-                onBackButtonPress={() => navigateBack()}
-            />
-            <Form
-                style={[styles.flexGrow1, styles.ph5]}
-                formID={ONYXKEYS.FORMS.MONEY_REQUEST_DESCRIPTION_FORM}
-                onSubmit={(value) => updateComment(value)}
-                submitButtonText={translate('common.save')}
-                enabledWhenOffline
-            >
-                <View style={styles.mb4}>
-                    <TextInput
-                        inputID="moneyRequestComment"
-                        name="moneyRequestComment"
-                        defaultValue={iou.comment}
-                        label={translate('moneyRequestConfirmationList.whatsItFor')}
-                        accessibilityLabel={translate('moneyRequestConfirmationList.whatsItFor')}
-                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                        ref={(el) => (inputRef.current = el)}
-                        autoGrowHeight
-                        containerStyles={[styles.autoGrowHeightMultilineInput]}
-                        textAlignVertical="top"
-                        submitOnEnter={!Browser.isMobile()}
-                    />
-                </View>
-            </Form>
+            <>
+                <HeaderWithBackButton
+                    title={translate('common.description')}
+                    onBackButtonPress={() => navigateBack()}
+                />
+                <Form
+                    style={[styles.flexGrow1, styles.ph5]}
+                    formID={ONYXKEYS.FORMS.MONEY_REQUEST_DESCRIPTION_FORM}
+                    onSubmit={(value) => updateComment(value)}
+                    submitButtonText={translate('common.save')}
+                    enabledWhenOffline
+                >
+                    <View style={styles.mb4}>
+                        <TextInput
+                            inputID="moneyRequestComment"
+                            name="moneyRequestComment"
+                            defaultValue={iou.comment}
+                            label={translate('moneyRequestConfirmationList.whatsItFor')}
+                            accessibilityLabel={translate('moneyRequestConfirmationList.whatsItFor')}
+                            accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
+                            ref={(el) => {
+                                if (!el) {
+                                    return;
+                                }
+                                inputRef.current = el;
+                                updateMultilineInputRange(inputRef.current);
+                            }}
+                            autoGrowHeight
+                            containerStyles={[styles.autoGrowHeightMultilineInput]}
+                            textAlignVertical="top"
+                            submitOnEnter={!Browser.isMobile()}
+                        />
+                    </View>
+                </Form>
+            </>
         </ScreenWrapper>
     );
 }
 
 MoneyRequestDescriptionPage.propTypes = propTypes;
 MoneyRequestDescriptionPage.defaultProps = defaultProps;
+MoneyRequestDescriptionPage.displayName = 'MoneyRequestDescriptionPage';
 
 export default withOnyx({
     iou: {
         key: ONYXKEYS.IOU,
     },
     selectedTab: {
-        key: `${ONYXKEYS.SELECTED_TAB}_${CONST.TAB.RECEIPT_TAB_ID}`,
+        key: `${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.RECEIPT_TAB_ID}`,
     },
 })(MoneyRequestDescriptionPage);
diff --git a/src/pages/iou/MoneyRequestEditWaypointPage.js b/src/pages/iou/MoneyRequestEditWaypointPage.js
new file mode 100644
index 000000000000..68f85848a69e
--- /dev/null
+++ b/src/pages/iou/MoneyRequestEditWaypointPage.js
@@ -0,0 +1,32 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import WaypointEditor from './WaypointEditor';
+
+const propTypes = {
+    /** Route params */
+    route: PropTypes.shape({
+        params: PropTypes.shape({
+            /** Thread reportID */
+            threadReportID: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+
+            /** ID of the transaction being edited */
+            transactionID: PropTypes.string,
+
+            /** Index of the waypoint being edited */
+            waypointIndex: PropTypes.string,
+        }),
+    }),
+};
+
+const defaultProps = {
+    route: {},
+};
+
+function MoneyRequestEditWaypointPage({route}) {
+    return <WaypointEditor route={route} />;
+}
+
+MoneyRequestEditWaypointPage.displayName = 'MoneyRequestEditWaypointPage';
+MoneyRequestEditWaypointPage.propTypes = propTypes;
+MoneyRequestEditWaypointPage.defaultProps = defaultProps;
+export default MoneyRequestEditWaypointPage;
diff --git a/src/pages/iou/MoneyRequestMerchantPage.js b/src/pages/iou/MoneyRequestMerchantPage.js
index 9a49b0259bd2..af20930ffe8d 100644
--- a/src/pages/iou/MoneyRequestMerchantPage.js
+++ b/src/pages/iou/MoneyRequestMerchantPage.js
@@ -59,12 +59,12 @@ function MoneyRequestMerchantPage({iou, route}) {
         }
 
         if (_.isEmpty(iou.participants) || (iou.amount === 0 && !iou.receiptPath) || shouldReset) {
-            Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType, reportID), true);
+            Navigation.goBack(ROUTES.MONEY_REQUEST.getRoute(iouType, reportID), true);
         }
     }, [iou.id, iou.participants, iou.amount, iou.receiptPath, iouType, reportID]);
 
     function navigateBack() {
-        Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
+        Navigation.goBack(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(iouType, reportID));
     }
 
     const validate = useCallback((value) => {
@@ -93,6 +93,7 @@ function MoneyRequestMerchantPage({iou, route}) {
             includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
             onEntryTransitionEnd={() => inputRef.current && inputRef.current.focus()}
+            testID={MoneyRequestMerchantPage.displayName}
         >
             <HeaderWithBackButton
                 title={translate('common.merchant')}
@@ -125,6 +126,7 @@ function MoneyRequestMerchantPage({iou, route}) {
 
 MoneyRequestMerchantPage.propTypes = propTypes;
 MoneyRequestMerchantPage.defaultProps = defaultProps;
+MoneyRequestMerchantPage.displayName = 'MoneyRequestMerchantPage';
 
 export default withOnyx({
     iou: {
diff --git a/src/pages/iou/MoneyRequestSelectorPage.js b/src/pages/iou/MoneyRequestSelectorPage.js
index 32d646702fb2..9e46b1d2d7a2 100644
--- a/src/pages/iou/MoneyRequestSelectorPage.js
+++ b/src/pages/iou/MoneyRequestSelectorPage.js
@@ -1,6 +1,6 @@
 import {withOnyx} from 'react-native-onyx';
 import {View} from 'react-native';
-import React, {useState} from 'react';
+import React, {useEffect, useState} from 'react';
 import lodashGet from 'lodash/get';
 import PropTypes from 'prop-types';
 import ONYXKEYS from '../../ONYXKEYS';
@@ -15,13 +15,14 @@ import Navigation from '../../libs/Navigation/Navigation';
 import styles from '../../styles/styles';
 import ReceiptSelector from './ReceiptSelector';
 import * as IOU from '../../libs/actions/IOU';
-import DistanceRequestPage from './DistanceRequestPage';
+import NewDistanceRequestPage from './NewDistanceRequestPage';
 import DragAndDropProvider from '../../components/DragAndDrop/Provider';
 import OnyxTabNavigator, {TopTab} from '../../libs/Navigation/OnyxTabNavigator';
 import NewRequestAmountPage from './steps/NewRequestAmountPage';
 import reportPropTypes from '../reportPropTypes';
 import * as ReportUtils from '../../libs/ReportUtils';
 import themeColors from '../../styles/themes/default';
+import usePrevious from '../../hooks/usePrevious';
 
 const propTypes = {
     /** React Navigation route */
@@ -69,6 +70,18 @@ function MoneyRequestSelectorPage(props) {
         IOU.resetMoneyRequestInfo(moneyRequestID);
     };
 
+    const prevSelectedTab = usePrevious(props.selectedTab);
+
+    useEffect(() => {
+        if (prevSelectedTab === props.selectedTab) {
+            return;
+        }
+
+        resetMoneyRequestInfo();
+        // resetMoneyRequestInfo function is not added as dependencies since they don't change between renders
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [props.selectedTab, prevSelectedTab]);
+
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
@@ -82,6 +95,7 @@ function MoneyRequestSelectorPage(props) {
                       ]
                     : []
             }
+            testID={MoneyRequestSelectorPage.displayName}
         >
             {({safeAreaPaddingBottomStyle}) => (
                 <FullPageNotFoundView shouldShow={!IOUUtils.isValidMoneyRequestType(iouType)}>
@@ -102,7 +116,6 @@ function MoneyRequestSelectorPage(props) {
                                         <TabSelector
                                             state={state}
                                             navigation={navigation}
-                                            onTabPress={resetMoneyRequestInfo}
                                             position={position}
                                         />
                                     )}
@@ -120,7 +133,7 @@ function MoneyRequestSelectorPage(props) {
                                     {shouldDisplayDistanceRequest && (
                                         <TopTab.Screen
                                             name={CONST.TAB.DISTANCE}
-                                            component={DistanceRequestPage}
+                                            component={NewDistanceRequestPage}
                                             initialParams={{reportID, iouType}}
                                         />
                                     )}
@@ -145,6 +158,6 @@ export default withOnyx({
         key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID}`,
     },
     selectedTab: {
-        key: `${ONYXKEYS.SELECTED_TAB}_${CONST.TAB.RECEIPT_TAB_ID}`,
+        key: `${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.RECEIPT_TAB_ID}`,
     },
 })(MoneyRequestSelectorPage);
diff --git a/src/pages/iou/MoneyRequestTagPage.js b/src/pages/iou/MoneyRequestTagPage.js
new file mode 100644
index 000000000000..43c0cd9d1480
--- /dev/null
+++ b/src/pages/iou/MoneyRequestTagPage.js
@@ -0,0 +1,114 @@
+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 * as IOU from '../../libs/actions/IOU';
+import * as PolicyUtils from '../../libs/PolicyUtils';
+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';
+import {iouPropTypes, iouDefaultProps} from './propTypes';
+
+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: tagPropTypes,
+
+    /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
+    iou: iouPropTypes,
+};
+
+const defaultProps = {
+    report: {},
+    policyTags: {},
+    iou: iouDefaultProps,
+};
+
+function MoneyRequestTagPage({route, report, policyTags, iou}) {
+    const {translate} = useLocalize();
+
+    const iouType = lodashGet(route, 'params.iouType', '');
+
+    // Fetches the first tag list of the policy
+    const tagListKey = _.first(_.keys(policyTags));
+    const policyTagListName = PolicyUtils.getTagListName(policyTags) || translate('common.tag');
+
+    const navigateBack = () => {
+        Navigation.goBack(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(iouType, report.reportID));
+    };
+
+    const updateTag = (selectedTag) => {
+        if (selectedTag.searchText === iou.tag) {
+            IOU.resetMoneyRequestTag();
+        } else {
+            IOU.setMoneyRequestTag(selectedTag.searchText);
+        }
+        navigateBack();
+    };
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+            testID={MoneyRequestTagPage.displayName}
+        >
+            <HeaderWithBackButton
+                title={policyTagListName}
+                onBackButtonPress={navigateBack}
+            />
+            <Text style={[styles.ph5, styles.pv3]}>{translate('iou.tagSelection', {tagName: policyTagListName})}</Text>
+            <TagPicker
+                policyID={report.policyID}
+                tag={tagListKey}
+                selectedTag={iou.tag}
+                onSubmit={updateTag}
+            />
+        </ScreenWrapper>
+    );
+}
+
+MoneyRequestTagPage.displayName = 'MoneyRequestTagPage';
+MoneyRequestTagPage.propTypes = propTypes;
+MoneyRequestTagPage.defaultProps = defaultProps;
+
+export default compose(
+    withOnyx({
+        report: {
+            key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID')}`,
+        },
+        iou: {
+            key: ONYXKEYS.IOU,
+        },
+    }),
+    // eslint-disable-next-line rulesdir/no-multiple-onyx-in-file
+    withOnyx({
+        policyTags: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '0'}`,
+        },
+    }),
+)(MoneyRequestTagPage);
diff --git a/src/pages/iou/DistanceRequestPage.js b/src/pages/iou/NewDistanceRequestPage.js
similarity index 78%
rename from src/pages/iou/DistanceRequestPage.js
rename to src/pages/iou/NewDistanceRequestPage.js
index d6eae999e2dc..562ea66453a1 100644
--- a/src/pages/iou/DistanceRequestPage.js
+++ b/src/pages/iou/NewDistanceRequestPage.js
@@ -42,8 +42,8 @@ const defaultProps = {
 
 // This component is responsible for getting the transactionID from the IOU key, or creating the transaction if it doesn't exist yet, and then passing the transactionID.
 // You can't use Onyx props in the withOnyx mapping, so we need to set up and access the transactionID here, and then pass it down so that DistanceRequest can subscribe to the transaction.
-function DistanceRequestPage({iou, report, route}) {
-    const iouType = lodashGet(route, 'params.iouType', '');
+function NewDistanceRequestPage({iou, report, route}) {
+    const iouType = lodashGet(route, 'params.iouType', 'request');
 
     useEffect(() => {
         if (iou.transactionID) {
@@ -54,22 +54,20 @@ function DistanceRequestPage({iou, report, route}) {
 
     return (
         <DistanceRequest
-            iou={iou}
-            iouType={iouType}
             report={report}
+            route={route}
             transactionID={iou.transactionID}
+            onSubmit={() => IOU.navigateToNextPage(iou, iouType, report)}
         />
     );
 }
 
-DistanceRequestPage.displayName = 'DistanceRequestPage';
-DistanceRequestPage.propTypes = propTypes;
-DistanceRequestPage.defaultProps = defaultProps;
+NewDistanceRequestPage.displayName = 'NewDistanceRequestPage';
+NewDistanceRequestPage.propTypes = propTypes;
+NewDistanceRequestPage.defaultProps = defaultProps;
 export default withOnyx({
-    // We must provide a default value for transactionID here, otherwise the component won't mount
-    // because withOnyx returns null until all the keys are defined
     iou: {key: ONYXKEYS.IOU},
     report: {
-        key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '')}`,
+        key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID')}`,
     },
-})(DistanceRequestPage);
+})(NewDistanceRequestPage);
diff --git a/src/pages/iou/WaypointEditorPage.js b/src/pages/iou/NewDistanceRequestWaypointEditorPage.js
similarity index 63%
rename from src/pages/iou/WaypointEditorPage.js
rename to src/pages/iou/NewDistanceRequestWaypointEditorPage.js
index 51c03623fb50..47dcbc8e4139 100644
--- a/src/pages/iou/WaypointEditorPage.js
+++ b/src/pages/iou/NewDistanceRequestWaypointEditorPage.js
@@ -32,18 +32,24 @@ const defaultProps = {
 
 // This component is responsible for grabbing the transactionID from the IOU key
 // You can't use Onyx props in the withOnyx mapping, so we need to set up and access the transactionID here, and then pass it down so that WaypointEditor can subscribe to the transaction.
-function WaypointEditorPage({transactionID, route}) {
+function NewDistanceRequestWaypointEditorPage({transactionID, route}) {
     return (
         <WaypointEditor
-            transactionID={transactionID}
-            route={route}
+            // Put the transactionID into the route params so that WaypointEdit behaves the same when creating a new waypoint
+            // or editing an existing waypoint.
+            route={{
+                params: {
+                    ...route.params,
+                    transactionID,
+                },
+            }}
         />
     );
 }
 
-WaypointEditorPage.displayName = 'WaypointEditorPage';
-WaypointEditorPage.propTypes = propTypes;
-WaypointEditorPage.defaultProps = defaultProps;
+NewDistanceRequestWaypointEditorPage.displayName = 'NewDistanceRequestWaypointEditorPage';
+NewDistanceRequestWaypointEditorPage.propTypes = propTypes;
+NewDistanceRequestWaypointEditorPage.defaultProps = defaultProps;
 export default withOnyx({
     transactionID: {key: ONYXKEYS.IOU, selector: (iou) => iou && iou.transactionID},
-})(WaypointEditorPage);
+})(NewDistanceRequestWaypointEditorPage);
diff --git a/src/pages/iou/ReceiptSelector/NavigationAwareCamera.js b/src/pages/iou/ReceiptSelector/NavigationAwareCamera.js
index 8fe00c7a65b3..d1f7a3db63d3 100644
--- a/src/pages/iou/ReceiptSelector/NavigationAwareCamera.js
+++ b/src/pages/iou/ReceiptSelector/NavigationAwareCamera.js
@@ -1,6 +1,5 @@
 import React, {useEffect, useState} from 'react';
 import {Camera} from 'react-native-vision-camera';
-import {useTabAnimation} from '@react-navigation/material-top-tabs';
 import {useNavigation} from '@react-navigation/native';
 import PropTypes from 'prop-types';
 import refPropTypes from '../../../components/refPropTypes';
@@ -19,22 +18,6 @@ function NavigationAwareCamera({cameraTabIndex, forwardedRef, ...props}) {
     const navigation = useNavigation();
     const [isCameraActive, setIsCameraActive] = useState(navigation.isFocused());
 
-    // Get the animation value from the tab navigator. Its a value between 0 and the
-    // number of pages we render in the tab navigator. When we even just slightly start to scroll to the camera page,
-    // (value is e.g. 0.001 on animation start) we want to activate the camera, so its as fast as possible active.
-    const tabPositionAnimation = useTabAnimation();
-
-    useEffect(() => {
-        const listenerId = tabPositionAnimation.addListener(({value}) => {
-            // Activate camera as soon the index is animating towards the `cameraTabIndex`
-            setIsCameraActive(value > cameraTabIndex - 1 && value < cameraTabIndex + 1);
-        });
-
-        return () => {
-            tabPositionAnimation.removeListener(listenerId);
-        };
-    }, [cameraTabIndex, tabPositionAnimation]);
-
     // Note: The useEffect can be removed once VisionCamera V3 is used.
     // Its only needed for android, because there is a native cameraX android bug. With out this flow would break the camera:
     // 1. Open camera tab
diff --git a/src/pages/iou/ReceiptSelector/TabNavigationAwareCamera.js b/src/pages/iou/ReceiptSelector/TabNavigationAwareCamera.js
new file mode 100644
index 000000000000..744a10376237
--- /dev/null
+++ b/src/pages/iou/ReceiptSelector/TabNavigationAwareCamera.js
@@ -0,0 +1,77 @@
+import React, {useEffect, useState} from 'react';
+import {Camera} from 'react-native-vision-camera';
+import {useTabAnimation} from '@react-navigation/material-top-tabs';
+import {useNavigation} from '@react-navigation/native';
+import PropTypes from 'prop-types';
+import refPropTypes from '../../../components/refPropTypes';
+
+const propTypes = {
+    /* The index of the tab that contains this camera */
+    cameraTabIndex: PropTypes.number.isRequired,
+
+    /* Forwarded ref */
+    forwardedRef: refPropTypes.isRequired,
+};
+
+// Wraps a camera that will only be active when the tab is focused or as soon as it starts to become focused.
+function TabNavigationAwareCamera({cameraTabIndex, forwardedRef, ...props}) {
+    // Get navigation to get initial isFocused value (only needed once during init!)
+    const navigation = useNavigation();
+    const [isCameraActive, setIsCameraActive] = useState(navigation.isFocused());
+
+    // Get the animation value from the tab navigator. Its a value between 0 and the
+    // number of pages we render in the tab navigator. When we even just slightly start to scroll to the camera page,
+    // (value is e.g. 0.001 on animation start) we want to activate the camera, so its as fast as possible active.
+    const tabPositionAnimation = useTabAnimation();
+
+    useEffect(() => {
+        const listenerId = tabPositionAnimation.addListener(({value}) => {
+            // Activate camera as soon the index is animating towards the `cameraTabIndex`
+            setIsCameraActive(value > cameraTabIndex - 1 && value < cameraTabIndex + 1);
+        });
+
+        return () => {
+            tabPositionAnimation.removeListener(listenerId);
+        };
+    }, [cameraTabIndex, tabPositionAnimation]);
+
+    // Note: The useEffect can be removed once VisionCamera V3 is used.
+    // Its only needed for android, because there is a native cameraX android bug. With out this flow would break the camera:
+    // 1. Open camera tab
+    // 2. Take a picture
+    // 3. Go back from the opened screen
+    // 4. The camera is not working anymore
+    useEffect(() => {
+        const removeBlurListener = navigation.addListener('blur', () => {
+            setIsCameraActive(false);
+        });
+        const removeFocusListener = navigation.addListener('focus', () => {
+            setIsCameraActive(true);
+        });
+
+        return () => {
+            removeBlurListener();
+            removeFocusListener();
+        };
+    }, [navigation]);
+
+    return (
+        <Camera
+            ref={forwardedRef}
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            isActive={isCameraActive}
+        />
+    );
+}
+
+TabNavigationAwareCamera.propTypes = propTypes;
+TabNavigationAwareCamera.displayName = 'TabNavigationAwareCamera';
+
+export default React.forwardRef((props, ref) => (
+    <TabNavigationAwareCamera
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...props}
+        forwardedRef={ref}
+    />
+));
diff --git a/src/pages/iou/ReceiptSelector/index.js b/src/pages/iou/ReceiptSelector/index.js
index 94246b1e6fd1..b4cf75801a3f 100644
--- a/src/pages/iou/ReceiptSelector/index.js
+++ b/src/pages/iou/ReceiptSelector/index.js
@@ -1,13 +1,13 @@
-import {View, Text, PixelRatio} from 'react-native';
-import React, {useContext, useState} from 'react';
+import {View, Text, PanResponder, PixelRatio} from 'react-native';
+import React, {useContext, useRef, useState} from 'react';
 import lodashGet from 'lodash/get';
+import _ from 'underscore';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import * as IOU from '../../../libs/actions/IOU';
 import reportPropTypes from '../../reportPropTypes';
 import CONST from '../../../CONST';
 import ReceiptUpload from '../../../../assets/images/receipt-upload.svg';
-import PressableWithFeedback from '../../../components/Pressable/PressableWithFeedback';
 import Button from '../../../components/Button';
 import styles from '../../../styles/styles';
 import CopyTextToClipboard from '../../../components/CopyTextToClipboard';
@@ -15,21 +15,14 @@ import ReceiptDropUI from '../ReceiptDropUI';
 import AttachmentPicker from '../../../components/AttachmentPicker';
 import ConfirmModal from '../../../components/ConfirmModal';
 import ONYXKEYS from '../../../ONYXKEYS';
-import Receipt from '../../../libs/actions/Receipt';
 import useWindowDimensions from '../../../hooks/useWindowDimensions';
 import useLocalize from '../../../hooks/useLocalize';
 import {DragAndDropContext} from '../../../components/DragAndDrop/Provider';
-import * as ReceiptUtils from '../../../libs/ReceiptUtils';
 import {iouPropTypes, iouDefaultProps} from '../propTypes';
+import * as FileUtils from '../../../libs/fileDownload/FileUtils';
+import Navigation from '../../../libs/Navigation/Navigation';
 
 const propTypes = {
-    /** Information shown to the user when a receipt is not valid */
-    receiptModal: PropTypes.shape({
-        isAttachmentInvalid: PropTypes.bool,
-        attachmentInvalidReasonTitle: PropTypes.string,
-        attachmentInvalidReason: PropTypes.string,
-    }),
-
     /** The report on which the request is initiated on */
     report: reportPropTypes,
 
@@ -43,33 +36,75 @@ const propTypes = {
             /** The report ID of the IOU */
             reportID: PropTypes.string,
         }),
+
+        /** The current route path */
+        path: PropTypes.string,
     }).isRequired,
 
     /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
     iou: iouPropTypes,
+
+    /** The id of the transaction we're editing */
+    transactionID: PropTypes.string,
+
+    /** Whether or not the receipt selector is in a tab navigator for tab animations */
+    // eslint-disable-next-line react/no-unused-prop-types
+    isInTabNavigator: PropTypes.bool,
 };
 
 const defaultProps = {
-    receiptModal: {
-        isAttachmentInvalid: false,
-        attachmentInvalidReasonTitle: '',
-        attachmentInvalidReason: '',
-    },
     report: {},
     iou: iouDefaultProps,
+    transactionID: '',
+    isInTabNavigator: true,
 };
 
 function ReceiptSelector(props) {
-    const reportID = lodashGet(props.route, 'params.reportID', '');
     const iouType = lodashGet(props.route, 'params.iouType', '');
-    const isAttachmentInvalid = lodashGet(props.receiptModal, 'isAttachmentInvalid', false);
-    const attachmentInvalidReasonTitle = lodashGet(props.receiptModal, 'attachmentInvalidReasonTitle', '');
-    const attachmentInvalidReason = lodashGet(props.receiptModal, 'attachmentInvalidReason', '');
+    const [isAttachmentInvalid, setIsAttachmentInvalid] = useState(false);
+    const [attachmentInvalidReasonTitle, setAttachmentInvalidReasonTitle] = useState('');
+    const [attachmentInvalidReason, setAttachmentValidReason] = useState('');
     const [receiptImageTopPosition, setReceiptImageTopPosition] = useState(0);
     const {isSmallScreenWidth} = useWindowDimensions();
     const {translate} = useLocalize();
     const {isDraggingOver} = useContext(DragAndDropContext);
 
+    const hideReciptModal = () => {
+        setIsAttachmentInvalid(false);
+    };
+
+    /**
+     * Sets the upload receipt error modal content when an invalid receipt is uploaded
+     * @param {*} isInvalid
+     * @param {*} title
+     * @param {*} reason
+     */
+    const setUploadReceiptError = (isInvalid, title, reason) => {
+        setIsAttachmentInvalid(isInvalid);
+        setAttachmentInvalidReasonTitle(title);
+        setAttachmentValidReason(reason);
+    };
+
+    function validateReceipt(file) {
+        const {fileExtension} = FileUtils.splitExtensionFromFileName(lodashGet(file, 'name', ''));
+        if (_.contains(CONST.API_ATTACHMENT_VALIDATIONS.UNALLOWED_EXTENSIONS, fileExtension.toLowerCase())) {
+            setUploadReceiptError(true, 'attachmentPicker.wrongFileType', 'attachmentPicker.notAllowedExtension');
+            return false;
+        }
+
+        if (lodashGet(file, 'size', 0) > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) {
+            setUploadReceiptError(true, 'attachmentPicker.attachmentTooLarge', 'attachmentPicker.sizeExceeded');
+            return false;
+        }
+
+        if (lodashGet(file, 'size', 0) < CONST.API_ATTACHMENT_VALIDATIONS.MIN_SIZE) {
+            setUploadReceiptError(true, 'attachmentPicker.attachmentTooSmall', 'attachmentPicker.sizeNotMet');
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * Sets the Receipt objects and navigates the user to the next page
      * @param {Object} file
@@ -77,15 +112,29 @@ function ReceiptSelector(props) {
      * @param {Object} report
      */
     const setReceiptAndNavigate = (file, iou, report) => {
-        if (!ReceiptUtils.validateReceipt(file)) {
+        if (!validateReceipt(file)) {
             return;
         }
 
         const filePath = URL.createObjectURL(file);
         IOU.setMoneyRequestReceipt(filePath, file.name);
-        IOU.navigateToNextPage(iou, iouType, reportID, report);
+
+        if (props.transactionID) {
+            IOU.replaceReceipt(props.transactionID, file, filePath);
+            Navigation.dismissModal();
+            return;
+        }
+
+        IOU.navigateToNextPage(iou, iouType, report, props.route.path);
     };
 
+    const panResponder = useRef(
+        PanResponder.create({
+            onMoveShouldSetPanResponder: () => true,
+            onPanResponderTerminationRequest: () => false,
+        }),
+    ).current;
+
     return (
         <View style={[styles.uploadReceiptView(isSmallScreenWidth)]}>
             {!isDraggingOver ? (
@@ -100,35 +149,37 @@ function ReceiptSelector(props) {
                             height={CONST.RECEIPT.ICON_SIZE}
                         />
                     </View>
-                    <Text style={[styles.textReceiptUpload]}>{translate('receipt.upload')}</Text>
-                    <Text style={[styles.subTextReceiptUpload]}>
-                        {isSmallScreenWidth ? translate('receipt.chooseReceipt') : translate('receipt.dragReceiptBeforeEmail')}
-                        <CopyTextToClipboard
-                            text={CONST.EMAIL.RECEIPTS}
-                            textStyles={[styles.textBlue]}
-                        />
-                        {isSmallScreenWidth ? null : translate('receipt.dragReceiptAfterEmail')}
-                    </Text>
+                    <View
+                        style={styles.receiptViewTextContainer}
+                        // eslint-disable-next-line react/jsx-props-no-spreading
+                        {...panResponder.panHandlers}
+                    >
+                        <Text style={[styles.textReceiptUpload]}>{translate('receipt.upload')}</Text>
+                        <Text style={[styles.subTextReceiptUpload]}>
+                            {isSmallScreenWidth ? translate('receipt.chooseReceipt') : translate('receipt.dragReceiptBeforeEmail')}
+                            <CopyTextToClipboard
+                                text={CONST.EMAIL.RECEIPTS}
+                                textStyles={[styles.textBlue]}
+                            />
+                            {isSmallScreenWidth ? null : translate('receipt.dragReceiptAfterEmail')}
+                        </Text>
+                    </View>
                     <AttachmentPicker>
                         {({openPicker}) => (
-                            <PressableWithFeedback
+                            <Button
+                                medium
+                                success
+                                text={translate('receipt.chooseFile')}
                                 accessibilityLabel={translate('receipt.chooseFile')}
-                                accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
-                            >
-                                <Button
-                                    medium
-                                    success
-                                    text={translate('receipt.chooseFile')}
-                                    style={[styles.p9]}
-                                    onPress={() => {
-                                        openPicker({
-                                            onPicked: (file) => {
-                                                setReceiptAndNavigate(file, props.iou, props.report);
-                                            },
-                                        });
-                                    }}
-                                />
-                            </PressableWithFeedback>
+                                style={[styles.p9]}
+                                onPress={() => {
+                                    openPicker({
+                                        onPicked: (file) => {
+                                            setReceiptAndNavigate(file, props.iou, props.report);
+                                        },
+                                    });
+                                }}
+                            />
                         )}
                     </AttachmentPicker>
                 </>
@@ -141,11 +192,11 @@ function ReceiptSelector(props) {
                 receiptImageTopPosition={receiptImageTopPosition}
             />
             <ConfirmModal
-                title={attachmentInvalidReasonTitle}
-                onConfirm={Receipt.clearUploadReceiptError}
-                onCancel={Receipt.clearUploadReceiptError}
+                title={attachmentInvalidReasonTitle ? translate(attachmentInvalidReasonTitle) : ''}
+                onConfirm={hideReciptModal}
+                onCancel={hideReciptModal}
                 isVisible={isAttachmentInvalid}
-                prompt={attachmentInvalidReason}
+                prompt={attachmentInvalidReason ? translate(attachmentInvalidReason) : ''}
                 confirmText={translate('common.close')}
                 shouldShowCancelButton={false}
             />
@@ -159,7 +210,6 @@ ReceiptSelector.displayName = 'ReceiptSelector';
 
 export default withOnyx({
     iou: {key: ONYXKEYS.IOU},
-    receiptModal: {key: ONYXKEYS.RECEIPT_MODAL},
     report: {
         key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '')}`,
     },
diff --git a/src/pages/iou/ReceiptSelector/index.native.js b/src/pages/iou/ReceiptSelector/index.native.js
index 4ff32d940c9f..4de4e9bb9148 100644
--- a/src/pages/iou/ReceiptSelector/index.native.js
+++ b/src/pages/iou/ReceiptSelector/index.native.js
@@ -23,6 +23,9 @@ import Log from '../../../libs/Log';
 import * as CameraPermission from './CameraPermission';
 import {iouPropTypes, iouDefaultProps} from '../propTypes';
 import NavigationAwareCamera from './NavigationAwareCamera';
+import Navigation from '../../../libs/Navigation/Navigation';
+import * as FileUtils from '../../../libs/fileDownload/FileUtils';
+import TabNavigationAwareCamera from './TabNavigationAwareCamera';
 
 const propTypes = {
     /** React Navigation route */
@@ -35,6 +38,9 @@ const propTypes = {
             /** The report ID of the IOU */
             reportID: PropTypes.string,
         }),
+
+        /** The current route path */
+        path: PropTypes.string,
     }).isRequired,
 
     /** The report on which the request is initiated on */
@@ -42,11 +48,19 @@ const propTypes = {
 
     /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
     iou: iouPropTypes,
+
+    /** The id of the transaction we're editing */
+    transactionID: PropTypes.string,
+
+    /** Whether or not the receipt selector is in a tab navigator for tab animations */
+    isInTabNavigator: PropTypes.bool,
 };
 
 const defaultProps = {
     report: {},
     iou: iouDefaultProps,
+    transactionID: '',
+    isInTabNavigator: true,
 };
 
 /**
@@ -74,7 +88,7 @@ function getImagePickerOptions(type) {
     };
 }
 
-function ReceiptSelector(props) {
+function ReceiptSelector({route, report, iou, transactionID, isInTabNavigator}) {
     const devices = useCameraDevices('wide-angle-camera');
     const device = devices.back;
 
@@ -84,12 +98,14 @@ function ReceiptSelector(props) {
     const isAndroidBlockedPermissionRef = useRef(false);
     const appState = useRef(AppState.currentState);
 
-    const iouType = lodashGet(props.route, 'params.iouType', '');
-    const reportID = lodashGet(props.route, 'params.reportID', '');
-    const pageIndex = lodashGet(props.route, 'params.pageIndex', 1);
+    const iouType = lodashGet(route, 'params.iouType', '');
+    const reportID = lodashGet(route, 'params.reportID', '');
+    const pageIndex = lodashGet(route, 'params.pageIndex', 1);
 
     const {translate} = useLocalize();
 
+    const CameraComponent = isInTabNavigator ? TabNavigationAwareCamera : NavigationAwareCamera;
+
     // We want to listen to if the app has come back from background and refresh the permissions status to show camera when permissions were granted
     useEffect(() => {
         const subscription = AppState.addEventListener('change', (nextAppState) => {
@@ -195,14 +211,25 @@ function ReceiptSelector(props) {
                 flash: flash ? 'on' : 'off',
             })
             .then((photo) => {
-                IOU.setMoneyRequestReceipt(`file://${photo.path}`, photo.path);
-                IOU.navigateToNextPage(props.iou, iouType, reportID, props.report);
+                const filePath = `file://${photo.path}`;
+                IOU.setMoneyRequestReceipt(filePath, photo.path);
+
+                if (transactionID) {
+                    FileUtils.readFileAsync(filePath, photo.path).then((receipt) => {
+                        IOU.replaceReceipt(transactionID, receipt, filePath);
+                    });
+
+                    Navigation.dismissModal();
+                    return;
+                }
+
+                IOU.navigateToNextPage(iou, iouType, reportID, report, route.path);
             })
             .catch((error) => {
                 showCameraAlert();
                 Log.warn('Error taking photo', error);
             });
-    }, [flash, iouType, props.iou, props.report, reportID, translate]);
+    }, [flash, iouType, iou, report, reportID, translate, transactionID, route.path]);
 
     CameraPermission.getCameraPermissionStatus().then((permissionStatus) => {
         setPermissions(permissionStatus);
@@ -219,18 +246,14 @@ function ReceiptSelector(props) {
                     />
                     <Text style={[styles.textReceiptUpload]}>{translate('receipt.takePhoto')}</Text>
                     <Text style={[styles.subTextReceiptUpload]}>{translate('receipt.cameraAccess')}</Text>
-                    <PressableWithFeedback
+                    <Button
+                        medium
+                        success
+                        text={translate('receipt.givePermission')}
                         accessibilityLabel={translate('receipt.givePermission')}
-                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
-                    >
-                        <Button
-                            medium
-                            success
-                            text={translate('receipt.givePermission')}
-                            style={[styles.p9, styles.pt5]}
-                            onPress={askForPermissions}
-                        />
-                    </PressableWithFeedback>
+                        style={[styles.p9, styles.pt5]}
+                        onPress={askForPermissions}
+                    />
                 </View>
             )}
             {permissions === RESULTS.GRANTED && device == null && (
@@ -243,7 +266,7 @@ function ReceiptSelector(props) {
                 </View>
             )}
             {permissions === RESULTS.GRANTED && device != null && (
-                <NavigationAwareCamera
+                <CameraComponent
                     ref={camera}
                     device={device}
                     style={[styles.cameraView]}
@@ -260,8 +283,18 @@ function ReceiptSelector(props) {
                     onPress={() => {
                         showImagePicker(launchImageLibrary)
                             .then((receiptImage) => {
-                                IOU.setMoneyRequestReceipt(receiptImage[0].uri, receiptImage[0].fileName);
-                                IOU.navigateToNextPage(props.iou, iouType, reportID, props.report);
+                                const filePath = receiptImage[0].uri;
+                                IOU.setMoneyRequestReceipt(filePath, receiptImage[0].fileName);
+
+                                if (transactionID) {
+                                    FileUtils.readFileAsync(filePath, receiptImage[0].fileName).then((receipt) => {
+                                        IOU.replaceReceipt(transactionID, receipt, filePath);
+                                    });
+                                    Navigation.dismissModal();
+                                    return;
+                                }
+
+                                IOU.navigateToNextPage(iou, iouType, report, route.path);
                             })
                             .catch(() => {
                                 Log.info('User did not select an image from gallery');
diff --git a/src/pages/iou/SplitBillDetailsPage.js b/src/pages/iou/SplitBillDetailsPage.js
index b11b16fa3c1b..23da92bcc9e7 100644
--- a/src/pages/iou/SplitBillDetailsPage.js
+++ b/src/pages/iou/SplitBillDetailsPage.js
@@ -61,21 +61,18 @@ function SplitBillDetailsPage(props) {
     let participants;
     if (ReportUtils.isPolicyExpenseChat(props.report)) {
         participants = [
-            ...OptionsListUtils.getParticipantsOptions([{accountID: participantAccountIDs[0], selected: true}], props.personalDetails),
-            ...OptionsListUtils.getPolicyExpenseReportOptions({...props.report, selected: true}),
+            OptionsListUtils.getParticipantsOption({accountID: participantAccountIDs[0], selected: true}, props.personalDetails),
+            OptionsListUtils.getPolicyExpenseReportOption({...props.report, selected: true}),
         ];
     } else {
-        participants = OptionsListUtils.getParticipantsOptions(
-            _.map(participantAccountIDs, (accountID) => ({accountID, selected: true})),
-            props.personalDetails,
-        );
+        participants = _.map(participantAccountIDs, (accountID) => OptionsListUtils.getParticipantsOption({accountID, selected: true}, props.personalDetails));
     }
     const payeePersonalDetails = props.personalDetails[reportAction.actorAccountID];
     const participantsExcludingPayee = _.filter(participants, (participant) => participant.accountID !== reportAction.actorAccountID);
     const {amount: splitAmount, currency: splitCurrency, comment: splitComment} = ReportUtils.getTransactionDetails(transaction);
 
     return (
-        <ScreenWrapper>
+        <ScreenWrapper testID={SplitBillDetailsPage.displayName}>
             <FullPageNotFoundView shouldShow={_.isEmpty(props.report) || _.isEmpty(reportAction)}>
                 <HeaderWithBackButton title={props.translate('common.details')} />
                 <View
diff --git a/src/pages/iou/WaypointEditor.js b/src/pages/iou/WaypointEditor.js
index 68e85a34746d..54269c197c1c 100644
--- a/src/pages/iou/WaypointEditor.js
+++ b/src/pages/iou/WaypointEditor.js
@@ -1,10 +1,10 @@
 import React, {useMemo, useRef, useState} from 'react';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
-import {View} from 'react-native';
+import {InteractionManager, View} from 'react-native';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
-import {useIsFocused} from '@react-navigation/native';
+import {useNavigation} from '@react-navigation/native';
 import AddressSearch from '../../components/AddressSearch';
 import ScreenWrapper from '../../components/ScreenWrapper';
 import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
@@ -23,17 +23,21 @@ import * as Transaction from '../../libs/actions/Transaction';
 import * as ValidationUtils from '../../libs/ValidationUtils';
 import ROUTES from '../../ROUTES';
 import transactionPropTypes from '../../components/transactionPropTypes';
+import * as ErrorUtils from '../../libs/ErrorUtils';
 
 const propTypes = {
-    /** The transactionID of the IOU */
-    transactionID: PropTypes.string.isRequired,
-
     /** Route params */
     route: PropTypes.shape({
         params: PropTypes.shape({
             /** IOU type */
             iouType: PropTypes.string,
 
+            /** Thread reportID */
+            threadReportID: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+
+            /** ID of the transaction being edited */
+            transactionID: PropTypes.string,
+
             /** Index of the waypoint being edited */
             waypointIndex: PropTypes.string,
         }),
@@ -58,24 +62,22 @@ const propTypes = {
         }),
     ),
 
+    /* Onyx props */
     /** The optimistic transaction for this request */
     transaction: transactionPropTypes,
 };
 
 const defaultProps = {
-    route: {
-        params: {
-            waypointIndex: '',
-        },
-    },
+    route: {},
     recentWaypoints: [],
     transaction: {},
 };
 
-function WaypointEditor({transactionID, route: {params: {iouType = '', waypointIndex = ''} = {}} = {}, transaction, recentWaypoints}) {
+function WaypointEditor({route: {params: {iouType = '', transactionID = '', waypointIndex = '', threadReportID = 0}} = {}, transaction, recentWaypoints}) {
     const {windowWidth} = useWindowDimensions();
     const [isDeleteStopModalOpen, setIsDeleteStopModalOpen] = useState(false);
-    const isFocused = useIsFocused();
+    const navigation = useNavigation();
+    const isFocused = navigation.isFocused();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const textInput = useRef(null);
@@ -96,6 +98,7 @@ function WaypointEditor({transactionID, route: {params: {iouType = '', waypointI
     }, [parsedWaypointIndex, waypointCount]);
 
     const waypointAddress = lodashGet(currentWaypoint, 'address', '');
+    const isEditingWaypoint = Boolean(threadReportID);
     const totalWaypoints = _.size(lodashGet(transaction, 'comment.waypoints', {}));
     // Hide the menu when there is only start and finish waypoint
     const shouldShowThreeDotsButton = totalWaypoints > 2;
@@ -104,19 +107,29 @@ function WaypointEditor({transactionID, route: {params: {iouType = '', waypointI
         const errors = {};
         const waypointValue = values[`waypoint${waypointIndex}`] || '';
         if (isOffline && waypointValue !== '' && !ValidationUtils.isValidAddress(waypointValue)) {
-            errors[`waypoint${waypointIndex}`] = 'bankAccount.error.address';
+            ErrorUtils.addErrorMessage(errors, `waypoint${waypointIndex}`, 'bankAccount.error.address');
         }
 
         // If the user is online and they are trying to save a value without using the autocomplete, show an error message instructing them to use a selected address instead.
         // That enables us to save the address with coordinates when it is selected
         if (!isOffline && waypointValue !== '' && waypointAddress !== waypointValue) {
-            errors[`waypoint${waypointIndex}`] = 'distance.errors.selectSuggestedAddress';
+            ErrorUtils.addErrorMessage(errors, `waypoint${waypointIndex}`, 'distance.errors.selectSuggestedAddress');
         }
 
         return errors;
     };
 
-    const onSubmit = (values) => {
+    const saveWaypoint = (waypoint) => {
+        if (parsedWaypointIndex < _.size(allWaypoints)) {
+            Transaction.saveWaypoint(transactionID, waypointIndex, waypoint);
+        } else {
+            const finishWaypoint = lodashGet(allWaypoints, `waypoint${_.size(allWaypoints) - 1}`, {});
+            Transaction.saveWaypoint(transactionID, waypointIndex, finishWaypoint);
+            Transaction.saveWaypoint(transactionID, waypointIndex - 1, waypoint);
+        }
+    };
+
+    const submit = (values) => {
         const waypointValue = values[`waypoint${waypointIndex}`] || '';
 
         // Allows letting you set a waypoint to an empty value
@@ -132,18 +145,17 @@ function WaypointEditor({transactionID, route: {params: {iouType = '', waypointI
                 lng: null,
                 address: waypointValue,
             };
-
-            Transaction.saveWaypoint(transactionID, waypointIndex, waypoint);
+            saveWaypoint(waypoint);
         }
 
         // Other flows will be handled by selecting a waypoint with selectWaypoint as this is mainly for the offline flow
-        Navigation.goBack(ROUTES.getMoneyRequestDistanceTabRoute(iouType));
+        Navigation.goBack(ROUTES.MONEY_REQUEST_DISTANCE_TAB.getRoute(iouType));
     };
 
     const deleteStopAndHideModal = () => {
         Transaction.removeWaypoint(transactionID, waypointIndex);
         setIsDeleteStopModalOpen(false);
-        Navigation.goBack(ROUTES.getMoneyRequestDistanceTabRoute(iouType));
+        Navigation.goBack(ROUTES.MONEY_REQUEST_DISTANCE_TAB.getRoute(iouType));
     };
 
     const selectWaypoint = (values) => {
@@ -152,9 +164,22 @@ function WaypointEditor({transactionID, route: {params: {iouType = '', waypointI
             lng: values.lng,
             address: values.address,
         };
+        Transaction.saveWaypoint(transactionID, waypointIndex, waypoint, isEditingWaypoint);
+
+        if (isEditingWaypoint) {
+            Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(threadReportID));
+            return;
+        }
+        Navigation.goBack(ROUTES.MONEY_REQUEST_DISTANCE_TAB.getRoute(iouType));
+    };
 
-        Transaction.saveWaypoint(transactionID, waypointIndex, waypoint);
-        Navigation.goBack(ROUTES.getMoneyRequestDistanceTabRoute(iouType));
+    const focusAddressInput = () => {
+        InteractionManager.runAfterInteractions(() => {
+            if (!textInput.current) {
+                return;
+            }
+            textInput.current.focus();
+        });
     };
 
     return (
@@ -162,13 +187,14 @@ function WaypointEditor({transactionID, route: {params: {iouType = '', waypointI
             includeSafeAreaPaddingBottom={false}
             onEntryTransitionEnd={() => textInput.current && textInput.current.focus()}
             shouldEnableMaxHeight
+            testID={WaypointEditor.displayName}
         >
-            <FullPageNotFoundView shouldShow={(Number.isNaN(parsedWaypointIndex) || parsedWaypointIndex < 0 || parsedWaypointIndex > waypointCount - 1) && isFocused}>
+            <FullPageNotFoundView shouldShow={(Number.isNaN(parsedWaypointIndex) || parsedWaypointIndex < 0 || parsedWaypointIndex > waypointCount) && isFocused}>
                 <HeaderWithBackButton
                     title={translate(wayPointDescriptionKey)}
                     shouldShowBackButton
                     onBackButtonPress={() => {
-                        Navigation.goBack(ROUTES.getMoneyRequestDistanceTabRoute(iouType));
+                        Navigation.goBack(ROUTES.MONEY_REQUEST_DISTANCE_TAB.getRoute(iouType));
                     }}
                     shouldShowThreeDotsButton={shouldShowThreeDotsButton}
                     threeDotsAnchorPosition={styles.threeDotsPopoverOffset(windowWidth)}
@@ -179,12 +205,14 @@ function WaypointEditor({transactionID, route: {params: {iouType = '', waypointI
                             onSelected: () => setIsDeleteStopModalOpen(true),
                         },
                     ]}
+                    onModalHide={focusAddressInput}
                 />
                 <ConfirmModal
                     title={translate('distance.deleteWaypoint')}
                     isVisible={isDeleteStopModalOpen}
                     onConfirm={deleteStopAndHideModal}
                     onCancel={() => setIsDeleteStopModalOpen(false)}
+                    onModalHide={focusAddressInput}
                     prompt={translate('distance.deleteWaypointConfirmation')}
                     confirmText={translate('common.delete')}
                     cancelText={translate('common.cancel')}
@@ -195,7 +223,7 @@ function WaypointEditor({transactionID, route: {params: {iouType = '', waypointI
                     formID={ONYXKEYS.FORMS.WAYPOINT_FORM}
                     enabledWhenOffline
                     validate={validate}
-                    onSubmit={onSubmit}
+                    onSubmit={submit}
                     shouldValidateOnChange={false}
                     shouldValidateOnBlur={false}
                     submitButtonText={translate('common.save')}
@@ -204,7 +232,7 @@ function WaypointEditor({transactionID, route: {params: {iouType = '', waypointI
                         <AddressSearch
                             inputID={`waypoint${waypointIndex}`}
                             ref={(e) => (textInput.current = e)}
-                            hint={!isOffline ? translate('distance.errors.selectSuggestedAddress') : ''}
+                            hint={!isOffline ? 'distance.errors.selectSuggestedAddress' : ''}
                             containerStyles={[styles.mt4]}
                             label={translate('distance.address')}
                             defaultValue={waypointAddress}
@@ -236,7 +264,7 @@ WaypointEditor.propTypes = propTypes;
 WaypointEditor.defaultProps = defaultProps;
 export default withOnyx({
     transaction: {
-        key: ({transactionID}) => `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+        key: ({route}) => `${ONYXKEYS.COLLECTION.TRANSACTION}${lodashGet(route, 'params.transactionID')}`,
         selector: (transaction) => (transaction ? {transactionID: transaction.transactionID, comment: {waypoints: lodashGet(transaction, 'comment.waypoints')}} : null),
     },
     recentWaypoints: {
diff --git a/src/pages/iou/propTypes/index.js b/src/pages/iou/propTypes/index.js
index c7559323ebc1..586f8424a2c2 100644
--- a/src/pages/iou/propTypes/index.js
+++ b/src/pages/iou/propTypes/index.js
@@ -18,6 +18,12 @@ const iouPropTypes = PropTypes.shape({
     /** The merchant name */
     merchant: PropTypes.string,
 
+    /** The category name */
+    category: PropTypes.string,
+
+    /** The tag */
+    tag: PropTypes.string,
+
     /** Date that the request was created */
     created: PropTypes.string,
 
@@ -34,6 +40,8 @@ const iouDefaultProps = {
     currency: CONST.CURRENCY.USD,
     comment: '',
     merchant: '',
+    category: '',
+    tag: '',
     created: '',
     participants: [],
     receiptPath: '',
diff --git a/src/pages/iou/steps/MoneyRequestAmountForm.js b/src/pages/iou/steps/MoneyRequestAmountForm.js
index 1ea0b002b235..c4fc29957179 100644
--- a/src/pages/iou/steps/MoneyRequestAmountForm.js
+++ b/src/pages/iou/steps/MoneyRequestAmountForm.js
@@ -12,6 +12,7 @@ import * as DeviceCapabilities from '../../../libs/DeviceCapabilities';
 import TextInputWithCurrencySymbol from '../../../components/TextInputWithCurrencySymbol';
 import useLocalize from '../../../hooks/useLocalize';
 import CONST from '../../../CONST';
+import FormHelpMessage from '../../../components/FormHelpMessage';
 import refPropTypes from '../../../components/refPropTypes';
 import getOperatingSystem from '../../../libs/getOperatingSystem';
 import * as Browser from '../../../libs/Browser';
@@ -57,6 +58,8 @@ const getNewSelection = (oldSelection, prevLength, newLength) => {
     return {start: cursorPosition, end: cursorPosition};
 };
 
+const isAmountValid = (amount) => !amount.length || parseFloat(amount) < 0.01;
+
 const AMOUNT_VIEW_ID = 'amountView';
 const NUM_PAD_CONTAINER_VIEW_ID = 'numPadContainerView';
 const NUM_PAD_VIEW_ID = 'numPadView';
@@ -70,6 +73,9 @@ function MoneyRequestAmountForm({amount, currency, isEditing, forwardedRef, onCu
     const selectedAmountAsString = amount ? CurrencyUtils.convertToFrontendAmount(amount).toString() : '';
 
     const [currentAmount, setCurrentAmount] = useState(selectedAmountAsString);
+    const [isInvalidAmount, setIsInvalidAmount] = useState(isAmountValid(selectedAmountAsString));
+    const [firstPress, setFirstPress] = useState(false);
+    const [formError, setFormError] = useState('');
     const [shouldUpdateSelection, setShouldUpdateSelection] = useState(true);
 
     const [selection, setSelection] = useState({
@@ -100,7 +106,7 @@ function MoneyRequestAmountForm({amount, currency, isEditing, forwardedRef, onCu
     };
 
     useEffect(() => {
-        if (!currency || !amount) {
+        if (!currency || !_.isNumber(amount)) {
             return;
         }
         const amountAsStringForState = CurrencyUtils.convertToFrontendAmount(amount).toString();
@@ -127,6 +133,9 @@ function MoneyRequestAmountForm({amount, currency, isEditing, forwardedRef, onCu
             setSelection((prevSelection) => ({...prevSelection}));
             return;
         }
+        const checkInvalidAmount = isAmountValid(newAmountWithoutSpaces);
+        setIsInvalidAmount(checkInvalidAmount);
+        setFormError(checkInvalidAmount ? 'iou.error.invalidAmount' : '');
         setCurrentAmount((prevAmount) => {
             const strippedAmount = MoneyRequestUtils.stripCommaFromAmount(newAmountWithoutSpaces);
             const isForwardDelete = prevAmount.length > strippedAmount.length && forwardDeletePressedRef.current;
@@ -177,8 +186,13 @@ function MoneyRequestAmountForm({amount, currency, isEditing, forwardedRef, onCu
      * Submit amount and navigate to a proper page
      */
     const submitAndNavigateToNextPage = useCallback(() => {
+        if (isInvalidAmount) {
+            setFirstPress(true);
+            setFormError('iou.error.invalidAmount');
+            return;
+        }
         onSubmitButtonPress(currentAmount);
-    }, [onSubmitButtonPress, currentAmount]);
+    }, [onSubmitButtonPress, currentAmount, isInvalidAmount]);
 
     /**
      * Input handler to check for a forward-delete key (or keyboard shortcut) press.
@@ -231,9 +245,16 @@ function MoneyRequestAmountForm({amount, currency, isEditing, forwardedRef, onCu
                     onKeyPress={textInputKeyPress}
                 />
             </View>
+            {!_.isEmpty(formError) && firstPress && (
+                <FormHelpMessage
+                    style={[styles.ph5]}
+                    isError
+                    message={translate(formError)}
+                />
+            )}
             <View
                 onMouseDown={(event) => onMouseDown(event, [NUM_PAD_CONTAINER_VIEW_ID, NUM_PAD_VIEW_ID])}
-                style={[styles.w100, styles.justifyContentEnd, styles.pageWrapper]}
+                style={[styles.w100, styles.justifyContentEnd, styles.pageWrapper, styles.pt0]}
                 nativeID={NUM_PAD_CONTAINER_VIEW_ID}
             >
                 {DeviceCapabilities.canUseTouchScreen() ? (
@@ -249,7 +270,6 @@ function MoneyRequestAmountForm({amount, currency, isEditing, forwardedRef, onCu
                     style={[styles.w100, styles.mt5]}
                     onPress={submitAndNavigateToNextPage}
                     pressOnEnter
-                    isDisabled={!currentAmount.length || parseFloat(currentAmount) < 0.01}
                     text={buttonText}
                 />
             </View>
diff --git a/src/pages/iou/steps/MoneyRequestConfirmPage.js b/src/pages/iou/steps/MoneyRequestConfirmPage.js
index 178179f31745..3881221d5c52 100644
--- a/src/pages/iou/steps/MoneyRequestConfirmPage.js
+++ b/src/pages/iou/steps/MoneyRequestConfirmPage.js
@@ -23,9 +23,11 @@ import reportPropTypes from '../../reportPropTypes';
 import personalDetailsPropType from '../../personalDetailsPropType';
 import * as FileUtils from '../../../libs/fileDownload/FileUtils';
 import * as Policy from '../../../libs/actions/Policy';
+import useNetwork from '../../../hooks/useNetwork';
 import useWindowDimensions from '../../../hooks/useWindowDimensions';
 import * as StyleUtils from '../../../styles/StyleUtils';
 import {iouPropTypes, iouDefaultProps} from '../propTypes';
+import * as Expensicons from '../../../components/Icon/Expensicons';
 
 const propTypes = {
     /** React Navigation route */
@@ -59,33 +61,39 @@ const defaultProps = {
 };
 
 function MoneyRequestConfirmPage(props) {
-    const {windowHeight} = useWindowDimensions();
+    const {isOffline} = useNetwork();
+    const {windowHeight, windowWidth} = useWindowDimensions();
     const prevMoneyRequestId = useRef(props.iou.id);
     const iouType = useRef(lodashGet(props.route, 'params.iouType', ''));
     const isDistanceRequest = MoneyRequestUtils.isDistanceRequest(iouType.current, props.selectedTab);
     const reportID = useRef(lodashGet(props.route, 'params.reportID', ''));
     const participants = useMemo(
         () =>
-            lodashGet(props.iou.participants, [0, 'isPolicyExpenseChat'], false)
-                ? OptionsListUtils.getPolicyExpenseReportOptions(props.iou.participants[0])
-                : OptionsListUtils.getParticipantsOptions(props.iou.participants, props.personalDetails),
+            _.map(props.iou.participants, (participant) => {
+                const isPolicyExpenseChat = lodashGet(participant, 'isPolicyExpenseChat', false);
+                return isPolicyExpenseChat ? OptionsListUtils.getPolicyExpenseReportOption(participant) : OptionsListUtils.getParticipantsOption(participant, props.personalDetails);
+            }),
         [props.iou.participants, props.personalDetails],
     );
+    const isManualRequestDM = props.selectedTab === CONST.TAB.MANUAL && iouType.current === CONST.IOU.MONEY_REQUEST_TYPE.REQUEST;
 
     useEffect(() => {
         const policyExpenseChat = _.find(participants, (participant) => participant.isPolicyExpenseChat);
         if (policyExpenseChat) {
             Policy.openDraftWorkspaceRequest(policyExpenseChat.policyID);
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
+        // Verification to reset billable with a default value, when value in IOU was changed
+        if (typeof props.iou.billable !== 'boolean') {
+            IOU.setMoneyRequestBillable(lodashGet(props.policy, 'defaultBillable', false));
+        }
+    }, [isOffline, participants, props.iou.billable, props.policy]);
 
     useEffect(() => {
         // ID in Onyx could change by initiating a new request in a separate browser tab or completing a request
         if (!isDistanceRequest && prevMoneyRequestId.current !== props.iou.id) {
             // The ID is cleared on completing a request. In that case, we will do nothing.
             if (props.iou.id) {
-                Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType.current, reportID.current), true);
+                Navigation.goBack(ROUTES.MONEY_REQUEST.getRoute(iouType.current, reportID.current), true);
             }
             return;
         }
@@ -98,7 +106,7 @@ function MoneyRequestConfirmPage(props) {
         }
 
         if (_.isEmpty(props.iou.participants) || (props.iou.amount === 0 && !props.iou.receiptPath && !isDistanceRequest) || shouldReset) {
-            Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType.current, reportID.current), true);
+            Navigation.goBack(ROUTES.MONEY_REQUEST.getRoute(iouType.current, reportID.current), true);
         }
 
         return () => {
@@ -109,9 +117,9 @@ function MoneyRequestConfirmPage(props) {
     const navigateBack = () => {
         let fallback;
         if (reportID.current) {
-            fallback = ROUTES.getMoneyRequestRoute(iouType.current, reportID.current);
+            fallback = ROUTES.MONEY_REQUEST.getRoute(iouType.current, reportID.current);
         } else {
-            fallback = ROUTES.getMoneyRequestParticipantsRoute(iouType.current);
+            fallback = ROUTES.MONEY_REQUEST_PARTICIPANTS.getRoute(iouType.current);
         }
         Navigation.goBack(fallback);
     };
@@ -134,9 +142,23 @@ function MoneyRequestConfirmPage(props) {
                 selectedParticipants[0],
                 trimmedComment,
                 receipt,
+                props.iou.category,
+                props.iou.tag,
+                props.iou.billable,
             );
         },
-        [props.report, props.iou.amount, props.iou.currency, props.iou.created, props.iou.merchant, props.currentUserPersonalDetails.login, props.currentUserPersonalDetails.accountID],
+        [
+            props.report,
+            props.iou.amount,
+            props.iou.currency,
+            props.iou.created,
+            props.iou.merchant,
+            props.currentUserPersonalDetails.login,
+            props.currentUserPersonalDetails.accountID,
+            props.iou.category,
+            props.iou.tag,
+            props.iou.billable,
+        ],
     );
 
     /**
@@ -151,12 +173,15 @@ function MoneyRequestConfirmPage(props) {
                 trimmedComment,
                 props.iou.created,
                 props.iou.transactionID,
+                props.iou.category,
+                props.iou.tag,
                 props.iou.amount,
                 props.iou.currency,
                 props.iou.merchant,
+                props.iou.billable,
             );
         },
-        [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.tag, props.iou.amount, props.iou.currency, props.iou.merchant, props.iou.billable],
     );
 
     const createTransaction = useCallback(
@@ -192,7 +217,9 @@ function MoneyRequestConfirmPage(props) {
             }
 
             if (props.iou.receiptPath && props.iou.receiptSource) {
-                FileUtils.readFileAsync(props.iou.receiptPath, props.iou.receiptSource).then((receipt) => {
+                FileUtils.readFileAsync(props.iou.receiptPath, props.iou.receiptSource).then((file) => {
+                    const receipt = file;
+                    receipt.state = file && isManualRequestDM ? CONST.IOU.RECEIPT_STATE.OPEN : CONST.IOU.RECEIPT_STATE.SCANREADY;
                     requestMoney(selectedParticipants, trimmedComment, receipt);
                 });
                 return;
@@ -216,6 +243,7 @@ function MoneyRequestConfirmPage(props) {
             isDistanceRequest,
             requestMoney,
             createDistanceRequest,
+            isManualRequestDM,
         ],
     );
 
@@ -235,11 +263,6 @@ function MoneyRequestConfirmPage(props) {
                 return;
             }
 
-            if (paymentMethodType === CONST.IOU.PAYMENT_TYPE.PAYPAL_ME) {
-                IOU.sendMoneyViaPaypal(props.report, props.iou.amount, currency, trimmedComment, props.currentUserPersonalDetails.accountID, participant);
-                return;
-            }
-
             if (paymentMethodType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY) {
                 IOU.sendMoneyWithWallet(props.report, props.iou.amount, currency, trimmedComment, props.currentUserPersonalDetails.accountID, participant);
             }
@@ -247,13 +270,37 @@ function MoneyRequestConfirmPage(props) {
         [props.iou.amount, props.iou.comment, participants, props.iou.currency, props.currentUserPersonalDetails.accountID, props.report],
     );
 
+    const headerTitle = () => {
+        if (isDistanceRequest) {
+            return props.translate('common.distance');
+        }
+
+        if (iouType.current === CONST.IOU.MONEY_REQUEST_TYPE.SPLIT) {
+            return props.translate('iou.split');
+        }
+
+        return props.translate('tabSelector.manual');
+    };
+
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={MoneyRequestConfirmPage.displayName}
+        >
             {({safeAreaPaddingBottomStyle}) => (
                 <View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
                     <HeaderWithBackButton
-                        title={isDistanceRequest ? props.translate('common.distance') : props.translate('iou.cash')}
+                        title={headerTitle()}
                         onBackButtonPress={navigateBack}
+                        shouldShowThreeDotsButton={isManualRequestDM}
+                        threeDotsAnchorPosition={styles.threeDotsPopoverOffsetNoCloseButton(windowWidth)}
+                        threeDotsMenuItems={[
+                            {
+                                icon: Expensicons.Receipt,
+                                text: props.translate('receipt.addReceipt'),
+                                onSelected: () => Navigation.navigate(ROUTES.MONEY_REQUEST_RECEIPT.getRoute(iouType.current, reportID.current)),
+                            },
+                        ]}
                     />
                     {/*
                      * The MoneyRequestConfirmationList component uses a SectionList which uses a VirtualizedList internally.
@@ -272,6 +319,10 @@ function MoneyRequestConfirmPage(props) {
                                 iouAmount={props.iou.amount}
                                 iouComment={props.iou.comment}
                                 iouCurrencyCode={props.iou.currency}
+                                iouIsBillable={props.iou.billable}
+                                onToggleBillable={IOU.setMoneyRequestBillable}
+                                iouCategory={props.iou.category}
+                                iouTag={props.iou.tag}
                                 onConfirm={createTransaction}
                                 onSendMoney={sendMoney}
                                 onSelectParticipant={(option) => {
@@ -320,6 +371,7 @@ export default compose(
             key: ONYXKEYS.IOU,
         },
     }),
+    // eslint-disable-next-line rulesdir/no-multiple-onyx-in-file
     withOnyx({
         report: {
             key: ({route, iou}) => {
@@ -336,7 +388,13 @@ export default compose(
             key: ONYXKEYS.PERSONAL_DETAILS_LIST,
         },
         selectedTab: {
-            key: `${ONYXKEYS.SELECTED_TAB}_${CONST.TAB.RECEIPT_TAB_ID}`,
+            key: `${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.RECEIPT_TAB_ID}`,
+        },
+    }),
+    // eslint-disable-next-line rulesdir/no-multiple-onyx-in-file
+    withOnyx({
+        policy: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`,
         },
     }),
 )(MoneyRequestConfirmPage);
diff --git a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js
index 68b21189f546..8d745903eb40 100644
--- a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js
+++ b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js
@@ -1,23 +1,22 @@
-import React, {useEffect, useRef} from 'react';
+import React, {useEffect, useRef, useState} from 'react';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import lodashGet from 'lodash/get';
+import _ from 'underscore';
 import CONST from '../../../../CONST';
 import ONYXKEYS from '../../../../ONYXKEYS';
 import ROUTES from '../../../../ROUTES';
-import MoneyRequestParticipantsSplitSelector from './MoneyRequestParticipantsSplitSelector';
 import MoneyRequestParticipantsSelector from './MoneyRequestParticipantsSelector';
 import styles from '../../../../styles/styles';
 import ScreenWrapper from '../../../../components/ScreenWrapper';
-import withLocalize, {withLocalizePropTypes} from '../../../../components/withLocalize';
 import Navigation from '../../../../libs/Navigation/Navigation';
-import compose from '../../../../libs/compose';
 import * as DeviceCapabilities from '../../../../libs/DeviceCapabilities';
 import HeaderWithBackButton from '../../../../components/HeaderWithBackButton';
 import * as IOU from '../../../../libs/actions/IOU';
 import * as MoneyRequestUtils from '../../../../libs/MoneyRequestUtils';
 import {iouPropTypes, iouDefaultProps} from '../../propTypes';
+import useLocalize from '../../../../hooks/useLocalize';
 
 const propTypes = {
     /** React Navigation route */
@@ -37,33 +36,59 @@ 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 = {
     iou: iouDefaultProps,
 };
 
-function MoneyRequestParticipantsPage(props) {
-    const prevMoneyRequestId = useRef(props.iou.id);
-    const iouType = useRef(lodashGet(props.route, 'params.iouType', ''));
-    const reportID = useRef(lodashGet(props.route, 'params.reportID', ''));
-    const isDistanceRequest = MoneyRequestUtils.isDistanceRequest(iouType.current, props.selectedTab);
+function MoneyRequestParticipantsPage({iou, selectedTab, route}) {
+    const {translate} = useLocalize();
+    const prevMoneyRequestId = useRef(iou.id);
+    const isNewReportIDSelectedLocally = useRef(false);
+    const optionsSelectorRef = useRef();
+    const iouType = useRef(lodashGet(route, 'params.iouType', ''));
+    const reportID = useRef(lodashGet(route, 'params.reportID', ''));
+    const isDistanceRequest = MoneyRequestUtils.isDistanceRequest(iouType.current, selectedTab);
+    const isScanRequest = MoneyRequestUtils.isScanRequest(selectedTab);
+    const isSplitRequest = iou.id === CONST.IOU.MONEY_REQUEST_TYPE.SPLIT;
+    const [headerTitle, setHeaderTitle] = useState();
+
+    useEffect(() => {
+        if (isDistanceRequest) {
+            setHeaderTitle(translate('common.distance'));
+            return;
+        }
+
+        setHeaderTitle(_.isEmpty(iou.participants) ? translate('tabSelector.manual') : translate('iou.split'));
+    }, [iou.participants, isDistanceRequest, translate]);
 
-    const navigateToNextStep = () => {
-        Navigation.navigate(ROUTES.getMoneyRequestConfirmationRoute(iouType.current, reportID.current));
+    const navigateToRequestStep = (moneyRequestType, option) => {
+        if (option.reportID) {
+            isNewReportIDSelectedLocally.current = true;
+            IOU.setMoneyRequestId(`${moneyRequestType}${option.reportID}`);
+            Navigation.navigate(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(moneyRequestType, option.reportID));
+            return;
+        }
+
+        IOU.setMoneyRequestId(moneyRequestType);
+        Navigation.navigate(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(moneyRequestType, reportID.current));
+    };
+
+    const navigateToSplitStep = (moneyRequestType) => {
+        IOU.setMoneyRequestId(moneyRequestType);
+        Navigation.navigate(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(moneyRequestType, reportID.current));
     };
 
     const navigateBack = (forceFallback = false) => {
-        Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType.current, reportID.current), forceFallback);
+        Navigation.goBack(ROUTES.MONEY_REQUEST.getRoute(iouType.current, reportID.current), forceFallback);
     };
 
     useEffect(() => {
         // ID in Onyx could change by initiating a new request in a separate browser tab or completing a request
-        if (prevMoneyRequestId.current !== props.iou.id) {
+        if (prevMoneyRequestId.current !== iou.id) {
             // The ID is cleared on completing a request. In that case, we will do nothing
-            if (!isDistanceRequest && props.iou.id) {
+            if (iou.id && !isDistanceRequest && !isSplitRequest && !isNewReportIDSelectedLocally.current) {
                 navigateBack(true);
             }
             return;
@@ -71,46 +96,43 @@ function MoneyRequestParticipantsPage(props) {
 
         // Reset the money request Onyx if the ID in Onyx does not match the ID from params
         const moneyRequestId = `${iouType.current}${reportID.current}`;
-        const shouldReset = props.iou.id !== moneyRequestId;
+        const shouldReset = iou.id !== moneyRequestId && !isNewReportIDSelectedLocally.current;
         if (shouldReset) {
             IOU.resetMoneyRequestInfo(moneyRequestId);
         }
-        if (!isDistanceRequest && ((props.iou.amount === 0 && !props.iou.receiptPath) || shouldReset)) {
+        if (!isDistanceRequest && ((iou.amount === 0 && !iou.receiptPath) || shouldReset)) {
             navigateBack(true);
         }
 
         return () => {
-            prevMoneyRequestId.current = props.iou.id;
+            prevMoneyRequestId.current = iou.id;
         };
-    }, [props.iou.amount, props.iou.id, props.iou.receiptPath, isDistanceRequest]);
+    }, [iou.amount, iou.id, iou.receiptPath, isDistanceRequest, isSplitRequest]);
 
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight={DeviceCapabilities.canUseTouchScreen()}
+            onEntryTransitionEnd={() => optionsSelectorRef.current && optionsSelectorRef.current.focus()}
+            testID={MoneyRequestParticipantsPage.displayName}
         >
             {({safeAreaPaddingBottomStyle}) => (
                 <View style={styles.flex1}>
                     <HeaderWithBackButton
-                        title={isDistanceRequest ? props.translate('common.distance') : props.translate('iou.cash')}
+                        title={headerTitle}
                         onBackButtonPress={navigateBack}
                     />
-                    {iouType.current === CONST.IOU.MONEY_REQUEST_TYPE.SPLIT ? (
-                        <MoneyRequestParticipantsSplitSelector
-                            onStepComplete={navigateToNextStep}
-                            participants={props.iou.participants}
-                            onAddParticipants={IOU.setMoneyRequestParticipants}
-                            safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
-                        />
-                    ) : (
-                        <MoneyRequestParticipantsSelector
-                            onStepComplete={navigateToNextStep}
-                            onAddParticipants={IOU.setMoneyRequestParticipants}
-                            safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
-                            iouType={iouType.current}
-                            isDistanceRequest={isDistanceRequest}
-                        />
-                    )}
+                    <MoneyRequestParticipantsSelector
+                        ref={(el) => (optionsSelectorRef.current = el)}
+                        participants={iou.participants}
+                        onAddParticipants={IOU.setMoneyRequestParticipants}
+                        navigateToRequest={(option) => navigateToRequestStep(CONST.IOU.MONEY_REQUEST_TYPE.REQUEST, option)}
+                        navigateToSplit={() => navigateToSplitStep(CONST.IOU.MONEY_REQUEST_TYPE.SPLIT)}
+                        safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
+                        iouType={iouType.current}
+                        isDistanceRequest={isDistanceRequest}
+                        isScanRequest={isScanRequest}
+                    />
                 </View>
             )}
         </ScreenWrapper>
@@ -121,12 +143,11 @@ MoneyRequestParticipantsPage.displayName = 'IOUParticipantsPage';
 MoneyRequestParticipantsPage.propTypes = propTypes;
 MoneyRequestParticipantsPage.defaultProps = defaultProps;
 
-export default compose(
-    withLocalize,
-    withOnyx({
-        iou: {key: ONYXKEYS.IOU},
-        selectedTab: {
-            key: `${ONYXKEYS.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..05b206ce4147 100755
--- a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
+++ b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSelector.js
@@ -1,27 +1,49 @@
-import React, {Component} from 'react';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
+import lodashGet from 'lodash/get';
+import ONYXKEYS from '../../../../ONYXKEYS';
+import styles from '../../../../styles/styles';
+import OptionsSelector from '../../../../components/OptionsSelector';
 import * as OptionsListUtils from '../../../../libs/OptionsListUtils';
 import * as ReportUtils from '../../../../libs/ReportUtils';
-import OptionsSelector from '../../../../components/OptionsSelector';
-import ONYXKEYS from '../../../../ONYXKEYS';
 import withLocalize, {withLocalizePropTypes} from '../../../../components/withLocalize';
+import * as Browser from '../../../../libs/Browser';
 import compose from '../../../../libs/compose';
 import CONST from '../../../../CONST';
 import personalDetailsPropType from '../../../personalDetailsPropType';
 import reportPropTypes from '../../../reportPropTypes';
+import refPropTypes from '../../../../components/refPropTypes';
 
 const propTypes = {
     /** Beta features list */
     betas: PropTypes.arrayOf(PropTypes.string),
 
-    /** Callback to inform parent modal of success */
-    onStepComplete: PropTypes.func.isRequired,
+    /** Callback to request parent modal to go to next step, which should be split */
+    navigateToRequest: PropTypes.func.isRequired,
+
+    /** Callback to request parent modal to go to next step, which should be split */
+    navigateToSplit: PropTypes.func.isRequired,
+
+    /** A ref to forward to options selector's text input */
+    forwardedRef: refPropTypes,
 
     /** Callback to add participants in MoneyRequestModal */
     onAddParticipants: PropTypes.func.isRequired,
 
+    /** Selected participants from MoneyRequestModal with login */
+    participants: PropTypes.arrayOf(
+        PropTypes.shape({
+            accountID: PropTypes.number,
+            login: PropTypes.string,
+            isPolicyExpenseChat: PropTypes.bool,
+            isOwnPolicyExpenseChat: PropTypes.bool,
+            selected: PropTypes.bool,
+        }),
+    ),
+
     /** All of the personal details for everyone */
     personalDetails: PropTypes.objectOf(personalDetailsPropType),
 
@@ -37,146 +59,225 @@ const propTypes = {
     /** Whether the money request is a distance request or not */
     isDistanceRequest: PropTypes.bool,
 
+    /** Whether the money request is a scan request or not */
+    isScanRequest: PropTypes.bool,
+
     ...withLocalizePropTypes,
 };
 
 const defaultProps = {
+    participants: [],
+    forwardedRef: undefined,
     safeAreaPaddingBottomStyle: {},
     personalDetails: {},
     reports: {},
     betas: [],
     isDistanceRequest: false,
+    isScanRequest: false,
 };
 
-class MoneyRequestParticipantsSelector extends Component {
-    constructor(props) {
-        super(props);
-
-        this.addSingleParticipant = this.addSingleParticipant.bind(this);
-        this.updateOptionsWithSearchTerm = this.updateOptionsWithSearchTerm.bind(this);
+function MoneyRequestParticipantsSelector({
+    forwardedRef,
+    betas,
+    participants,
+    personalDetails,
+    reports,
+    translate,
+    navigateToRequest,
+    navigateToSplit,
+    onAddParticipants,
+    safeAreaPaddingBottomStyle,
+    iouType,
+    isDistanceRequest,
+    isScanRequest,
+}) {
+    const [searchTerm, setSearchTerm] = useState('');
+    const [newChatOptions, setNewChatOptions] = useState({
+        recentReports: [],
+        personalDetails: [],
+        userToInvite: null,
+    });
 
-        const {recentReports, personalDetails, userToInvite} = this.getRequestOptions();
-
-        this.state = {
-            recentReports,
-            personalDetails,
-            userToInvite,
-            searchTerm: '',
-        };
-    }
-
-    componentDidUpdate(prevProps) {
-        if (_.isEqual(prevProps.reports, this.props.reports) && _.isEqual(prevProps.personalDetails, this.props.personalDetails)) {
-            return;
-        }
-        this.updateOptionsWithSearchTerm(this.state.searchTerm);
-    }
-
-    /**
-     * @param {string} searchTerm
-     * @returns {Object}
-     */
-    getRequestOptions(searchTerm = '') {
-        return OptionsListUtils.getNewChatOptions(
-            this.props.reports,
-            this.props.personalDetails,
-            this.props.betas,
-            searchTerm,
-            [],
-            CONST.EXPENSIFY_EMAILS,
-
-            // If we are using this component in the "Request money" flow then we pass the includeOwnedWorkspaceChats argument so that the current user
-            // sees the option to request money from their admin on their own Workspace Chat.
-            this.props.iouType === CONST.IOU.MONEY_REQUEST_TYPE.REQUEST,
-
-            // We don't want to include any P2P options like personal details or reports that are not workspace chats for certain features.
-            !this.props.isDistanceRequest,
-        );
-    }
+    const maxParticipantsReached = participants.length === CONST.REPORT.MAXIMUM_PARTICIPANTS;
 
     /**
      * Returns the sections needed for the OptionsSelector
      *
      * @returns {Array}
      */
-    getSections() {
-        const sections = [];
+    const sections = useMemo(() => {
+        const newSections = [];
         let indexOffset = 0;
 
-        sections.push({
-            title: this.props.translate('common.recents'),
-            data: this.state.recentReports,
-            shouldShow: !_.isEmpty(this.state.recentReports),
+        newSections.push({
+            title: undefined,
+            data: _.map(participants, (participant) => {
+                const isPolicyExpenseChat = lodashGet(participant, 'isPolicyExpenseChat', false);
+                return isPolicyExpenseChat ? OptionsListUtils.getPolicyExpenseReportOption(participant) : OptionsListUtils.getParticipantsOption(participant, personalDetails);
+            }),
+            shouldShow: true,
+            indexOffset,
+        });
+        indexOffset += participants.length;
+
+        if (maxParticipantsReached) {
+            return newSections;
+        }
+
+        newSections.push({
+            title: translate('common.recents'),
+            data: newChatOptions.recentReports,
+            shouldShow: !_.isEmpty(newChatOptions.recentReports),
             indexOffset,
         });
-        indexOffset += this.state.recentReports.length;
+        indexOffset += newChatOptions.recentReports.length;
 
-        sections.push({
-            title: this.props.translate('common.contacts'),
-            data: this.state.personalDetails,
-            shouldShow: !_.isEmpty(this.state.personalDetails),
+        newSections.push({
+            title: translate('common.contacts'),
+            data: newChatOptions.personalDetails,
+            shouldShow: !_.isEmpty(newChatOptions.personalDetails),
             indexOffset,
         });
-        indexOffset += this.state.personalDetails.length;
+        indexOffset += newChatOptions.personalDetails.length;
 
-        if (this.state.userToInvite && !OptionsListUtils.isCurrentUser(this.state.userToInvite)) {
-            sections.push({
+        if (newChatOptions.userToInvite && !OptionsListUtils.isCurrentUser(newChatOptions.userToInvite)) {
+            newSections.push({
                 undefined,
-                data: [this.state.userToInvite],
+                data: _.map([newChatOptions.userToInvite], (participant) => {
+                    const isPolicyExpenseChat = lodashGet(participant, 'isPolicyExpenseChat', false);
+                    return isPolicyExpenseChat ? OptionsListUtils.getPolicyExpenseReportOption(participant) : OptionsListUtils.getParticipantsOption(participant, personalDetails);
+                }),
                 shouldShow: true,
                 indexOffset,
             });
         }
 
-        return sections;
-    }
-
-    updateOptionsWithSearchTerm(searchTerm = '') {
-        const {recentReports, personalDetails, userToInvite} = this.getRequestOptions(searchTerm);
-        this.setState({
-            searchTerm,
-            recentReports,
-            userToInvite,
-            personalDetails,
-        });
-    }
+        return newSections;
+    }, [maxParticipantsReached, newChatOptions, participants, personalDetails, translate]);
 
     /**
      * Adds a single participant to the request
      *
      * @param {Object} option
      */
-    addSingleParticipant(option) {
-        this.props.onAddParticipants([{accountID: option.accountID, login: option.login, isPolicyExpenseChat: option.isPolicyExpenseChat, reportID: option.reportID, selected: true}]);
-        this.props.onStepComplete();
-    }
-
-    render() {
-        const headerMessage = OptionsListUtils.getHeaderMessage(
-            this.state.personalDetails.length + this.state.recentReports.length !== 0,
-            Boolean(this.state.userToInvite),
-            this.state.searchTerm,
+    const addSingleParticipant = (option) => {
+        onAddParticipants([
+            {accountID: option.accountID, login: option.login, isPolicyExpenseChat: option.isPolicyExpenseChat, reportID: option.reportID, selected: true, searchText: option.searchText},
+        ]);
+        navigateToRequest(option);
+    };
+
+    /**
+     * Removes a selected option from list if already selected. If not already selected add this option to the list.
+     * @param {Object} option
+     */
+    const addParticipantToSelection = useCallback(
+        (option) => {
+            const isOptionSelected = (selectedOption) => {
+                if (selectedOption.accountID && selectedOption.accountID === option.accountID) {
+                    return true;
+                }
+
+                if (selectedOption.reportID && selectedOption.reportID === option.reportID) {
+                    return true;
+                }
+
+                return false;
+            };
+            const isOptionInList = _.some(participants, isOptionSelected);
+            let newSelectedOptions;
+
+            if (isOptionInList) {
+                newSelectedOptions = _.reject(participants, isOptionSelected);
+            } else {
+                newSelectedOptions = [
+                    ...participants,
+                    {
+                        accountID: option.accountID,
+                        login: option.login,
+                        isPolicyExpenseChat: option.isPolicyExpenseChat,
+                        reportID: option.reportID,
+                        selected: true,
+                        searchText: option.searchText,
+                    },
+                ];
+            }
+
+            onAddParticipants(newSelectedOptions);
+        },
+        [participants, onAddParticipants],
+    );
+
+    const headerMessage = OptionsListUtils.getHeaderMessage(
+        newChatOptions.personalDetails.length + newChatOptions.recentReports.length !== 0,
+        Boolean(newChatOptions.userToInvite),
+        searchTerm.trim(),
+        maxParticipantsReached,
+        _.some(participants, (participant) => participant.searchText.toLowerCase().includes(searchTerm.trim().toLowerCase())),
+    );
+    const isOptionsDataReady = ReportUtils.isReportDataReady() && OptionsListUtils.isPersonalDetailsReady(personalDetails);
+
+    useEffect(() => {
+        const chatOptions = OptionsListUtils.getFilteredOptions(
+            reports,
+            personalDetails,
+            betas,
+            searchTerm,
+            participants,
+            CONST.EXPENSIFY_EMAILS,
+
+            // If we are using this component in the "Request money" flow then we pass the includeOwnedWorkspaceChats argument so that the current user
+            // sees the option to request money from their admin on their own Workspace Chat.
+            iouType === CONST.IOU.MONEY_REQUEST_TYPE.REQUEST,
+
+            // We don't want to include any P2P options like personal details or reports that are not workspace chats for certain features.
+            !isDistanceRequest,
         );
-        const isOptionsDataReady = ReportUtils.isReportDataReady() && OptionsListUtils.isPersonalDetailsReady(this.props.personalDetails);
+        setNewChatOptions({
+            recentReports: chatOptions.recentReports,
+            personalDetails: chatOptions.personalDetails,
+            userToInvite: chatOptions.userToInvite,
+        });
+    }, [betas, reports, participants, personalDetails, translate, searchTerm, setNewChatOptions, iouType, isDistanceRequest]);
+
+    // Right now you can't split a request with a workspace and other additional participants
+    // This is getting properly fixed in https://github.com/Expensify/App/issues/27508, but as a stop-gap to prevent
+    // the app from crashing on native when you try to do this, we'll going to hide the button if you have a workspace and other participants
+    const hasPolicyExpenseChatParticipant = _.some(participants, (participant) => participant.isPolicyExpenseChat);
+    const shouldShowConfirmButton = !(participants.length > 1 && hasPolicyExpenseChatParticipant);
+    const isAllowedToSplit = !isDistanceRequest && !isScanRequest;
 
-        return (
+    return (
+        <View style={[styles.flex1, styles.w100, participants.length > 0 ? safeAreaPaddingBottomStyle : {}]}>
             <OptionsSelector
-                sections={this.getSections()}
-                value={this.state.searchTerm}
-                onSelectRow={this.addSingleParticipant}
-                onChangeText={this.updateOptionsWithSearchTerm}
+                canSelectMultipleOptions={isAllowedToSplit}
+                shouldShowMultipleOptionSelectorAsButton
+                multipleOptionSelectorButtonText={translate('iou.split')}
+                onAddToSelection={addParticipantToSelection}
+                sections={sections}
+                selectedOptions={participants}
+                value={searchTerm}
+                onSelectRow={addSingleParticipant}
+                onChangeText={setSearchTerm}
+                ref={forwardedRef}
                 headerMessage={headerMessage}
-                textInputLabel={this.props.translate('optionsSelector.nameEmailOrPhoneNumber')}
                 boldStyle
-                safeAreaPaddingBottomStyle={this.props.safeAreaPaddingBottomStyle}
+                shouldShowConfirmButton={shouldShowConfirmButton && isAllowedToSplit}
+                confirmButtonText={translate('iou.addToSplit')}
+                onConfirmSelection={navigateToSplit}
+                textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
+                safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
                 shouldShowOptions={isOptionsDataReady}
+                shouldFocusOnSelectRow={!Browser.isMobile()}
+                shouldDelayFocus
             />
-        );
-    }
+        </View>
+    );
 }
 
 MoneyRequestParticipantsSelector.propTypes = propTypes;
 MoneyRequestParticipantsSelector.defaultProps = defaultProps;
+MoneyRequestParticipantsSelector.displayName = 'MoneyRequestParticipantsSelector';
 
 export default compose(
     withLocalize,
@@ -191,4 +292,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/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js
deleted file mode 100755
index 2ebddbdd8741..000000000000
--- a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js
+++ /dev/null
@@ -1,206 +0,0 @@
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import {View} from 'react-native';
-import PropTypes from 'prop-types';
-import _ from 'underscore';
-import {withOnyx} from 'react-native-onyx';
-import ONYXKEYS from '../../../../ONYXKEYS';
-import styles from '../../../../styles/styles';
-import OptionsSelector from '../../../../components/OptionsSelector';
-import * as OptionsListUtils from '../../../../libs/OptionsListUtils';
-import * as ReportUtils from '../../../../libs/ReportUtils';
-import CONST from '../../../../CONST';
-import withLocalize, {withLocalizePropTypes} from '../../../../components/withLocalize';
-import compose from '../../../../libs/compose';
-import personalDetailsPropType from '../../../personalDetailsPropType';
-import * as Browser from '../../../../libs/Browser';
-import reportPropTypes from '../../../reportPropTypes';
-
-const propTypes = {
-    /** Beta features list */
-    betas: PropTypes.arrayOf(PropTypes.string),
-
-    /** Callback to inform parent modal of success */
-    onStepComplete: PropTypes.func.isRequired,
-
-    /** Callback to add participants in MoneyRequestModal */
-    onAddParticipants: PropTypes.func.isRequired,
-
-    /** Selected participants from MoneyRequestModal with login */
-    participants: PropTypes.arrayOf(
-        PropTypes.shape({
-            accountID: PropTypes.number,
-            login: PropTypes.string,
-            isPolicyExpenseChat: PropTypes.bool,
-            isOwnPolicyExpenseChat: PropTypes.bool,
-            selected: PropTypes.bool,
-        }),
-    ),
-
-    /** All of the personal details for everyone */
-    personalDetails: PropTypes.objectOf(personalDetailsPropType),
-
-    /** All reports shared with the user */
-    reports: PropTypes.objectOf(reportPropTypes),
-
-    /** padding bottom style of safe area */
-    safeAreaPaddingBottomStyle: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
-
-    ...withLocalizePropTypes,
-};
-
-const defaultProps = {
-    participants: [],
-    betas: [],
-    personalDetails: {},
-    reports: {},
-    safeAreaPaddingBottomStyle: {},
-};
-
-function MoneyRequestParticipantsSplitSelector({betas, participants, personalDetails, reports, translate, onAddParticipants, onStepComplete, safeAreaPaddingBottomStyle}) {
-    const [searchTerm, setSearchTerm] = useState('');
-    const [newChatOptions, setNewChatOptions] = useState({
-        recentReports: [],
-        personalDetails: [],
-        userToInvite: null,
-    });
-
-    const maxParticipantsReached = participants.length === CONST.REPORT.MAXIMUM_PARTICIPANTS;
-
-    /**
-     * Returns the sections needed for the OptionsSelector
-     *
-     * @param {Boolean} maxParticipantsReached
-     * @returns {Array}
-     */
-    const sections = useMemo(() => {
-        const newSections = [];
-        let indexOffset = 0;
-
-        newSections.push({
-            title: undefined,
-            data: OptionsListUtils.getParticipantsOptions(participants, personalDetails),
-            shouldShow: true,
-            indexOffset,
-        });
-        indexOffset += participants.length;
-
-        if (maxParticipantsReached) {
-            return newSections;
-        }
-
-        newSections.push({
-            title: translate('common.recents'),
-            data: newChatOptions.recentReports,
-            shouldShow: !_.isEmpty(newChatOptions.recentReports),
-            indexOffset,
-        });
-        indexOffset += newChatOptions.recentReports.length;
-
-        newSections.push({
-            title: translate('common.contacts'),
-            data: newChatOptions.personalDetails,
-            shouldShow: !_.isEmpty(newChatOptions.personalDetails),
-            indexOffset,
-        });
-        indexOffset += newChatOptions.personalDetails.length;
-
-        if (newChatOptions.userToInvite && !OptionsListUtils.isCurrentUser(newChatOptions.userToInvite)) {
-            newSections.push({
-                undefined,
-                data: [newChatOptions.userToInvite],
-                shouldShow: true,
-                indexOffset,
-            });
-        }
-
-        return newSections;
-    }, [maxParticipantsReached, newChatOptions, participants, personalDetails, translate]);
-
-    /**
-     * Removes a selected option from list if already selected. If not already selected add this option to the list.
-     * @param {Object} option
-     */
-    const toggleOption = useCallback(
-        (option) => {
-            const isOptionInList = _.some(participants, (selectedOption) => selectedOption.accountID === option.accountID);
-
-            let newSelectedOptions;
-
-            if (isOptionInList) {
-                newSelectedOptions = _.reject(participants, (selectedOption) => selectedOption.accountID === option.accountID);
-            } else {
-                newSelectedOptions = [...participants, {accountID: option.accountID, login: option.login, selected: true, searchText: option.searchText}];
-            }
-
-            onAddParticipants(newSelectedOptions);
-
-            const chatOptions = OptionsListUtils.getNewChatOptions(reports, personalDetails, betas, isOptionInList ? searchTerm : '', newSelectedOptions, CONST.EXPENSIFY_EMAILS);
-
-            setNewChatOptions({
-                recentReports: chatOptions.recentReports,
-                personalDetails: chatOptions.personalDetails,
-                userToInvite: chatOptions.userToInvite,
-            });
-        },
-        [searchTerm, participants, onAddParticipants, reports, personalDetails, betas, setNewChatOptions],
-    );
-
-    const headerMessage = OptionsListUtils.getHeaderMessage(
-        newChatOptions.personalDetails.length + newChatOptions.recentReports.length !== 0,
-        Boolean(newChatOptions.userToInvite),
-        searchTerm,
-        maxParticipantsReached,
-        _.some(participants, (participant) => participant.searchText.toLowerCase().includes(searchTerm.toLowerCase())),
-    );
-    const isOptionsDataReady = ReportUtils.isReportDataReady() && OptionsListUtils.isPersonalDetailsReady(personalDetails);
-
-    useEffect(() => {
-        const chatOptions = OptionsListUtils.getNewChatOptions(reports, personalDetails, betas, searchTerm, participants, CONST.EXPENSIFY_EMAILS);
-        setNewChatOptions({
-            recentReports: chatOptions.recentReports,
-            personalDetails: chatOptions.personalDetails,
-            userToInvite: chatOptions.userToInvite,
-        });
-    }, [betas, reports, participants, personalDetails, translate, searchTerm, setNewChatOptions]);
-
-    return (
-        <View style={[styles.flex1, styles.w100, participants.length > 0 ? safeAreaPaddingBottomStyle : {}]}>
-            <OptionsSelector
-                canSelectMultipleOptions
-                sections={sections}
-                selectedOptions={participants}
-                value={searchTerm}
-                onSelectRow={toggleOption}
-                onChangeText={setSearchTerm}
-                headerMessage={headerMessage}
-                boldStyle
-                shouldShowConfirmButton
-                confirmButtonText={translate('common.next')}
-                onConfirmSelection={onStepComplete}
-                textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
-                safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
-                shouldShowOptions={isOptionsDataReady}
-                shouldFocusOnSelectRow={!Browser.isMobile()}
-            />
-        </View>
-    );
-}
-
-MoneyRequestParticipantsSplitSelector.propTypes = propTypes;
-MoneyRequestParticipantsSplitSelector.defaultProps = defaultProps;
-MoneyRequestParticipantsSplitSelector.displayName = 'MoneyRequestParticipantsSplitSelector';
-
-export default compose(
-    withLocalize,
-    withOnyx({
-        personalDetails: {
-            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-        },
-        reports: {
-            key: ONYXKEYS.COLLECTION.REPORT,
-        },
-        betas: {
-            key: ONYXKEYS.BETAS,
-        },
-    }),
-)(MoneyRequestParticipantsSplitSelector);
diff --git a/src/pages/iou/steps/NewRequestAmountPage.js b/src/pages/iou/steps/NewRequestAmountPage.js
index 32a9134cb101..c9e2ca464303 100644
--- a/src/pages/iou/steps/NewRequestAmountPage.js
+++ b/src/pages/iou/steps/NewRequestAmountPage.js
@@ -1,5 +1,5 @@
 import React, {useCallback, useEffect, useRef} from 'react';
-import {InteractionManager, View} from 'react-native';
+import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import {useFocusEffect} from '@react-navigation/native';
@@ -22,6 +22,7 @@ import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
 import ScreenWrapper from '../../../components/ScreenWrapper';
 import {iouPropTypes, iouDefaultProps} from '../propTypes';
 import CONST from '../../../CONST';
+import FullScreenLoadingIndicator from '../../../components/FullscreenLoadingIndicator';
 
 const propTypes = {
     /** React Navigation route */
@@ -67,24 +68,19 @@ function NewRequestAmountPage({route, iou, report, selectedTab}) {
     const currentCurrency = lodashGet(route, 'params.currency', '');
     const isDistanceRequestTab = MoneyRequestUtils.isDistanceRequest(iouType, selectedTab);
 
-    const currency = currentCurrency || iou.currency;
+    const currency = CurrencyUtils.isValidCurrencyCode(currentCurrency) ? currentCurrency : iou.currency;
 
-    const focusTextInput = () => {
-        // Component may not be initialized due to navigation transitions
-        // Wait until interactions are complete before trying to focus
-        InteractionManager.runAfterInteractions(() => {
-            // Focus text input
-            if (!textInput.current) {
-                return;
-            }
-
-            textInput.current.focus();
-        });
-    };
+    const focusTimeoutRef = useRef(null);
 
     useFocusEffect(
         useCallback(() => {
-            focusTextInput();
+            focusTimeoutRef.current = setTimeout(() => textInput.current && textInput.current.focus(), CONST.ANIMATED_TRANSITION);
+            return () => {
+                if (!focusTimeoutRef.current) {
+                    return;
+                }
+                clearTimeout(focusTimeoutRef.current);
+            };
         }, []),
     );
 
@@ -106,7 +102,7 @@ function NewRequestAmountPage({route, iou, report, selectedTab}) {
                 if (!iou.id) {
                     return;
                 }
-                Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType, reportID), true);
+                Navigation.goBack(ROUTES.MONEY_REQUEST.getRoute(iouType, reportID), true);
                 return;
             }
             const moneyRequestID = `${iouType}${reportID}`;
@@ -116,7 +112,7 @@ function NewRequestAmountPage({route, iou, report, selectedTab}) {
             }
 
             if (!isDistanceRequestTab && (_.isEmpty(iou.participants) || iou.amount === 0 || shouldReset)) {
-                Navigation.goBack(ROUTES.getMoneyRequestRoute(iouType, reportID), true);
+                Navigation.goBack(ROUTES.MONEY_REQUEST.getRoute(iouType, reportID), true);
             }
         }
 
@@ -126,7 +122,7 @@ function NewRequestAmountPage({route, iou, report, selectedTab}) {
     }, [iou.participants, iou.amount, iou.id, isEditing, iouType, reportID, isDistanceRequestTab]);
 
     const navigateBack = () => {
-        Navigation.goBack(isEditing ? ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID) : null);
+        Navigation.goBack(isEditing ? ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(iouType, reportID) : ROUTES.HOME);
     };
 
     const navigateToCurrencySelectionPage = () => {
@@ -138,7 +134,7 @@ function NewRequestAmountPage({route, iou, report, selectedTab}) {
 
         // Remove query from the route and encode it.
         const activeRoute = encodeURIComponent(Navigation.getActiveRoute().replace(/\?.*/, ''));
-        Navigation.navigate(ROUTES.getMoneyRequestCurrencyRoute(iouType, reportID, currency, activeRoute));
+        Navigation.navigate(ROUTES.MONEY_REQUEST_CURRENCY.getRoute(iouType, reportID, currency, activeRoute));
     };
 
     const navigateToNextPage = (currentAmount) => {
@@ -147,11 +143,11 @@ function NewRequestAmountPage({route, iou, report, selectedTab}) {
         IOU.setMoneyRequestCurrency(currency);
 
         if (isEditing) {
-            Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType, reportID));
+            Navigation.goBack(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(iouType, reportID));
             return;
         }
 
-        IOU.navigateToNextPage(iou, iouType, reportID, report);
+        IOU.navigateToNextPage(iou, iouType, report);
     };
 
     const content = (
@@ -165,6 +161,10 @@ function NewRequestAmountPage({route, iou, report, selectedTab}) {
         />
     );
 
+    if (!lodashGet(iou, 'didInitCurrency', false)) {
+        return <FullScreenLoadingIndicator />;
+    }
+
     // ScreenWrapper is only needed in edit mode because we have a dedicated route for the edit amount page (MoneyRequestEditAmountPage).
     // The rest of the cases this component is rendered through <MoneyRequestSelectorPage /> which has it's own ScreenWrapper
     if (!isEditing) {
@@ -175,14 +175,14 @@ function NewRequestAmountPage({route, iou, report, selectedTab}) {
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
             shouldEnableKeyboardAvoidingView={false}
-            onEntryTransitionEnd={focusTextInput}
+            testID={NewRequestAmountPage.displayName}
         >
             {({safeAreaPaddingBottomStyle}) => (
                 <FullPageNotFoundView shouldShow={!IOUUtils.isValidMoneyRequestType(iouType)}>
                     <View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
                         <HeaderWithBackButton
                             title={translate('iou.amount')}
-                            onBackButonBackButtonPress={navigateBack}
+                            onBackButtonPress={navigateBack}
                         />
                         {content}
                     </View>
@@ -202,6 +202,6 @@ export default withOnyx({
         key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '')}`,
     },
     selectedTab: {
-        key: `${ONYXKEYS.SELECTED_TAB}_${CONST.TAB.RECEIPT_TAB_ID}`,
+        key: `${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.RECEIPT_TAB_ID}`,
     },
 })(NewRequestAmountPage);
diff --git a/src/pages/reportMetadataPropTypes.js b/src/pages/reportMetadataPropTypes.js
new file mode 100644
index 000000000000..a75d71aef7b3
--- /dev/null
+++ b/src/pages/reportMetadataPropTypes.js
@@ -0,0 +1,9 @@
+import PropTypes from 'prop-types';
+
+export default PropTypes.shape({
+    /** Are we loading more report actions? */
+    isLoadingMoreReportActions: PropTypes.bool,
+
+    /** Flag to check if the report actions data are loading */
+    isLoadingReportActions: PropTypes.bool,
+});
diff --git a/src/pages/reportPropTypes.js b/src/pages/reportPropTypes.js
index da90e0a4ac5c..a2c41b5a8147 100644
--- a/src/pages/reportPropTypes.js
+++ b/src/pages/reportPropTypes.js
@@ -13,12 +13,6 @@ export default PropTypes.shape({
     /** List of icons for report participants */
     icons: PropTypes.arrayOf(avatarPropTypes),
 
-    /** Are we loading more report actions? */
-    isLoadingMoreReportActions: PropTypes.bool,
-
-    /** Flag to check if the report actions data are loading */
-    isLoadingReportActions: PropTypes.bool,
-
     /** Whether the user is not an admin of policyExpenseChat chat */
     isOwnPolicyExpenseChat: PropTypes.bool,
 
diff --git a/src/pages/settings/AboutPage/AboutPage.js b/src/pages/settings/AboutPage/AboutPage.js
index 4af48b896fe0..78a300a38057 100644
--- a/src/pages/settings/AboutPage/AboutPage.js
+++ b/src/pages/settings/AboutPage/AboutPage.js
@@ -81,7 +81,10 @@ function AboutPage(props) {
     ];
 
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={AboutPage.displayName}
+        >
             {({safeAreaPaddingBottomStyle}) => (
                 <>
                     <HeaderWithBackButton
diff --git a/src/pages/settings/AppDownloadLinks.js b/src/pages/settings/AppDownloadLinks.js
index c6c8035e5477..957120846f3b 100644
--- a/src/pages/settings/AppDownloadLinks.js
+++ b/src/pages/settings/AppDownloadLinks.js
@@ -55,7 +55,7 @@ function AppDownloadLinksPage(props) {
     ];
 
     return (
-        <ScreenWrapper>
+        <ScreenWrapper testID={AppDownloadLinksPage.displayName}>
             <HeaderWithBackButton
                 title={props.translate('initialSettingsPage.aboutPage.appDownloadLinks')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_ABOUT)}
diff --git a/src/pages/settings/InitialSettingsPage.js b/src/pages/settings/InitialSettingsPage.js
index a67e7cbc122e..86eff304df9b 100755
--- a/src/pages/settings/InitialSettingsPage.js
+++ b/src/pages/settings/InitialSettingsPage.js
@@ -1,6 +1,6 @@
 import lodashGet from 'lodash/get';
 import React, {useState, useEffect, useRef, useMemo, useCallback} from 'react';
-import {View, ScrollView} from 'react-native';
+import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
 import {withOnyx} from 'react-native-onyx';
@@ -12,11 +12,11 @@ import * as Session from '../../libs/actions/Session';
 import ONYXKEYS from '../../ONYXKEYS';
 import Tooltip from '../../components/Tooltip';
 import Avatar from '../../components/Avatar';
-import HeaderWithBackButton from '../../components/HeaderWithBackButton';
 import Navigation from '../../libs/Navigation/Navigation';
 import * as Expensicons from '../../components/Icon/Expensicons';
-import ScreenWrapper from '../../components/ScreenWrapper';
 import MenuItem from '../../components/MenuItem';
+import themeColors from '../../styles/themes/default';
+import SCREENS from '../../SCREENS';
 import ROUTES from '../../ROUTES';
 import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
 import compose from '../../libs/compose';
@@ -43,6 +43,7 @@ import PressableWithoutFeedback from '../../components/Pressable/PressableWithou
 import useLocalize from '../../hooks/useLocalize';
 import useSingleExecution from '../../hooks/useSingleExecution';
 import useWaitForNavigation from '../../hooks/useWaitForNavigation';
+import HeaderPageLayout from '../../components/HeaderPageLayout';
 
 const propTypes = {
     /* Onyx Props */
@@ -326,79 +327,81 @@ function InitialSettingsPage(props) {
     if (_.isEmpty(props.currentUserPersonalDetails)) {
         return null;
     }
-
-    return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
-            {({safeAreaPaddingBottomStyle}) => (
+    const headerContent = (
+        <View style={[styles.avatarSectionWrapper, styles.justifyContentCenter]}>
+            {_.isEmpty(props.currentUserPersonalDetails) || _.isUndefined(props.currentUserPersonalDetails.displayName) ? (
+                <CurrentUserPersonalDetailsSkeletonView
+                    backgroundColor={themeColors.appBG}
+                    avatarSize={CONST.AVATAR_SIZE.XLARGE}
+                />
+            ) : (
                 <>
-                    <HeaderWithBackButton title={translate('common.settings')} />
-                    <ScrollView
-                        contentContainerStyle={safeAreaPaddingBottomStyle}
-                        style={[styles.settingsPageBackground]}
+                    <Tooltip text={translate('common.profile')}>
+                        <PressableWithoutFeedback
+                            style={styles.mb3}
+                            onPress={openProfileSettings}
+                            accessibilityLabel={translate('common.profile')}
+                            accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
+                        >
+                            <OfflineWithFeedback pendingAction={lodashGet(props.currentUserPersonalDetails, 'pendingFields.avatar', null)}>
+                                <Avatar
+                                    imageStyles={[styles.avatarXLarge]}
+                                    source={UserUtils.getAvatar(props.currentUserPersonalDetails.avatar, props.session.accountID)}
+                                    size={CONST.AVATAR_SIZE.XLARGE}
+                                    fallbackIcon={props.currentUserPersonalDetails.fallbackIcon}
+                                />
+                            </OfflineWithFeedback>
+                        </PressableWithoutFeedback>
+                    </Tooltip>
+                    <PressableWithoutFeedback
+                        style={[styles.mt1, styles.mw100]}
+                        onPress={openProfileSettings}
+                        accessibilityLabel={translate('common.profile')}
+                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.LINK}
                     >
-                        <View style={styles.w100}>
-                            {_.isEmpty(props.currentUserPersonalDetails) || _.isUndefined(props.currentUserPersonalDetails.displayName) ? (
-                                <CurrentUserPersonalDetailsSkeletonView />
-                            ) : (
-                                <View style={styles.avatarSectionWrapper}>
-                                    <Tooltip text={translate('common.profile')}>
-                                        <PressableWithoutFeedback
-                                            style={[styles.mb3]}
-                                            onPress={openProfileSettings}
-                                            accessibilityLabel={translate('common.profile')}
-                                            accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
-                                        >
-                                            <OfflineWithFeedback pendingAction={lodashGet(props.currentUserPersonalDetails, 'pendingFields.avatar', null)}>
-                                                <Avatar
-                                                    imageStyles={[styles.avatarLarge]}
-                                                    source={UserUtils.getAvatar(props.currentUserPersonalDetails.avatar, props.session.accountID)}
-                                                    size={CONST.AVATAR_SIZE.LARGE}
-                                                />
-                                            </OfflineWithFeedback>
-                                        </PressableWithoutFeedback>
-                                    </Tooltip>
-                                    <PressableWithoutFeedback
-                                        style={[styles.mt1, styles.mw100]}
-                                        onPress={openProfileSettings}
-                                        accessibilityLabel={translate('common.profile')}
-                                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.LINK}
-                                    >
-                                        <Tooltip text={translate('common.profile')}>
-                                            <Text
-                                                style={[styles.textHeadline, styles.pre]}
-                                                numberOfLines={1}
-                                            >
-                                                {props.currentUserPersonalDetails.displayName ? props.currentUserPersonalDetails.displayName : props.formatPhoneNumber(props.session.email)}
-                                            </Text>
-                                        </Tooltip>
-                                    </PressableWithoutFeedback>
-                                    {Boolean(props.currentUserPersonalDetails.displayName) && (
-                                        <Text
-                                            style={[styles.textLabelSupporting, styles.mt1]}
-                                            numberOfLines={1}
-                                        >
-                                            {props.formatPhoneNumber(props.session.email)}
-                                        </Text>
-                                    )}
-                                </View>
-                            )}
-                            {getMenuItems}
-
-                            <ConfirmModal
-                                danger
-                                title={translate('common.areYouSure')}
-                                prompt={translate('initialSettingsPage.signOutConfirmationText')}
-                                confirmText={translate('initialSettingsPage.signOut')}
-                                cancelText={translate('common.cancel')}
-                                isVisible={shouldShowSignoutConfirmModal}
-                                onConfirm={() => signOut(true)}
-                                onCancel={() => toggleSignoutConfirmModal(false)}
-                            />
-                        </View>
-                    </ScrollView>
+                        <Tooltip text={translate('common.profile')}>
+                            <Text
+                                style={[styles.textHeadline, styles.pre]}
+                                numberOfLines={1}
+                            >
+                                {props.currentUserPersonalDetails.displayName ? props.currentUserPersonalDetails.displayName : props.formatPhoneNumber(props.session.email)}
+                            </Text>
+                        </Tooltip>
+                    </PressableWithoutFeedback>
+                    {Boolean(props.currentUserPersonalDetails.displayName) && (
+                        <Text
+                            style={[styles.textLabelSupporting, styles.mt1]}
+                            numberOfLines={1}
+                        >
+                            {props.formatPhoneNumber(props.session.email)}
+                        </Text>
+                    )}
                 </>
             )}
-        </ScreenWrapper>
+        </View>
+    );
+
+    return (
+        <HeaderPageLayout
+            title={translate('common.settings')}
+            headerContent={headerContent}
+            headerContainerStyles={[styles.staticHeaderImage, styles.justifyContentCenter]}
+            backgroundColor={themeColors.PAGE_BACKGROUND_COLORS[SCREENS.SETTINGS.ROOT]}
+        >
+            <View style={styles.w100}>
+                {getMenuItems}
+                <ConfirmModal
+                    danger
+                    title={translate('common.areYouSure')}
+                    prompt={translate('initialSettingsPage.signOutConfirmationText')}
+                    confirmText={translate('initialSettingsPage.signOut')}
+                    cancelText={translate('common.cancel')}
+                    isVisible={shouldShowSignoutConfirmModal}
+                    onConfirm={() => signOut(true)}
+                    onCancel={() => toggleSignoutConfirmModal(false)}
+                />
+            </View>
+        </HeaderPageLayout>
     );
 }
 
diff --git a/src/pages/settings/Preferences/LanguagePage.js b/src/pages/settings/Preferences/LanguagePage.js
index 0eb93853726a..f55e49eb561e 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,15 +18,18 @@ 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 (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={LanguagePage.displayName}
+        >
             <HeaderWithBackButton
                 title={props.translate('languagePage.language')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_PREFERENCES)}
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..38f856825dcc 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(
@@ -46,7 +46,10 @@ function PriorityModePage(props) {
     );
 
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={PriorityModePage.displayName}
+        >
             <HeaderWithBackButton
                 title={props.translate('priorityModePage.priorityMode')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_PREFERENCES)}
diff --git a/src/pages/settings/Preferences/ThemePage.js b/src/pages/settings/Preferences/ThemePage.js
index a260caa283e3..0dd6115e74e8 100644
--- a/src/pages/settings/Preferences/ThemePage.js
+++ b/src/pages/settings/Preferences/ThemePage.js
@@ -27,15 +27,18 @@ 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 (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={ThemePage.displayName}
+        >
             <HeaderWithBackButton
                 title={props.translate('themePage.theme')}
                 shouldShowBackButton
diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
index 5cc03eb66d54..7e8baba5a9ce 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
+++ b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
@@ -19,13 +19,13 @@ import OfflineWithFeedback from '../../../../components/OfflineWithFeedback';
 import DotIndicatorMessage from '../../../../components/DotIndicatorMessage';
 import ConfirmModal from '../../../../components/ConfirmModal';
 import * as User from '../../../../libs/actions/User';
-import CONST from '../../../../CONST';
 import * as ErrorUtils from '../../../../libs/ErrorUtils';
 import themeColors from '../../../../styles/themes/default';
 import ValidateCodeForm from './ValidateCodeForm';
 import ROUTES from '../../../../ROUTES';
 import FullscreenLoadingIndicator from '../../../../components/FullscreenLoadingIndicator';
 import FullPageNotFoundView from '../../../../components/BlockingViews/FullPageNotFoundView';
+import CONST from '../../../../CONST';
 
 const propTypes = {
     /* Onyx Props */
@@ -117,12 +117,12 @@ class ContactMethodDetailsPage extends Component {
     }
 
     componentDidUpdate(prevProps) {
-        const errorFields = lodashGet(this.props.loginList, [this.getContactMethod(), 'errorFields'], {});
-        const prevPendingFields = lodashGet(prevProps.loginList, [this.getContactMethod(), 'pendingFields'], {});
+        const validatedDate = lodashGet(this.props.loginList, [this.getContactMethod(), 'validatedDate']);
+        const prevValidatedDate = lodashGet(prevProps.loginList, [this.getContactMethod(), 'validatedDate']);
 
         // Navigate to methods page on successful magic code verification
-        // validateLogin property of errorFields & prev pendingFields is responsible to decide the status of the magic code verification
-        if (!errorFields.validateLogin && prevPendingFields.validateLogin === CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE) {
+        // validatedDate property is responsible to decide the status of the magic code verification
+        if (!prevValidatedDate && validatedDate) {
             Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS);
         }
     }
@@ -132,7 +132,22 @@ class ContactMethodDetailsPage extends Component {
      * @returns {string}
      */
     getContactMethod() {
-        return decodeURIComponent(lodashGet(this.props.route, 'params.contactMethod'));
+        const contactMethod = lodashGet(this.props.route, 'params.contactMethod');
+
+        // We find the number of times the url is encoded based on the last % sign and remove them.
+        const lastPercentIndex = contactMethod.lastIndexOf('%');
+        const encodePercents = contactMethod.substring(lastPercentIndex).match(new RegExp('25', 'g'));
+        let numberEncodePercents = encodePercents ? encodePercents.length : 0;
+        const beforeAtSign = contactMethod.substring(0, lastPercentIndex).replace(CONST.REGEX.ENCODE_PERCENT_CHARACTER, (match) => {
+            if (numberEncodePercents > 0) {
+                numberEncodePercents--;
+                return '%';
+            }
+            return match;
+        });
+        const afterAtSign = contactMethod.substring(lastPercentIndex).replace(CONST.REGEX.ENCODE_PERCENT_CHARACTER, '%');
+
+        return decodeURIComponent(beforeAtSign + afterAtSign);
     }
 
     /**
@@ -217,7 +232,7 @@ class ContactMethodDetailsPage extends Component {
         const loginData = this.props.loginList[contactMethod];
         if (!contactMethod || !loginData) {
             return (
-                <ScreenWrapper>
+                <ScreenWrapper testID={ContactMethodDetailsPage.displayName}>
                     <FullPageNotFoundView
                         shouldShow
                         linkKey="contacts.goBackContactMethods"
@@ -231,9 +246,13 @@ class ContactMethodDetailsPage extends Component {
         const isDefaultContactMethod = this.props.session.email === loginData.partnerUserID;
         const hasMagicCodeBeenSent = lodashGet(this.props.loginList, [contactMethod, 'validateCodeSent'], false);
         const isFailedAddContactMethod = Boolean(lodashGet(loginData, 'errorFields.addedLogin'));
+        const isFailedRemovedContactMethod = Boolean(lodashGet(loginData, 'errorFields.deletedLogin'));
 
         return (
-            <ScreenWrapper onEntryTransitionEnd={() => this.validateCodeFormRef.current && this.validateCodeFormRef.current.focus()}>
+            <ScreenWrapper
+                onEntryTransitionEnd={() => this.validateCodeFormRef.current && this.validateCodeFormRef.current.focus()}
+                testID={ContactMethodDetailsPage.displayName}
+            >
                 <HeaderWithBackButton
                     title={formattedContactMethod}
                     onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS)}
@@ -246,7 +265,7 @@ class ContactMethodDetailsPage extends Component {
                         prompt={this.props.translate('contacts.removeAreYouSure')}
                         confirmText={this.props.translate('common.yesContinue')}
                         cancelText={this.props.translate('common.cancel')}
-                        isVisible={this.state.isDeleteModalOpen}
+                        isVisible={this.state.isDeleteModalOpen && !isDefaultContactMethod}
                         danger
                     />
                     {isFailedAddContactMethod && (
@@ -287,9 +306,9 @@ class ContactMethodDetailsPage extends Component {
                     {isDefaultContactMethod ? (
                         <OfflineWithFeedback
                             pendingAction={lodashGet(loginData, 'pendingFields.defaultLogin', null)}
-                            errors={ErrorUtils.getLatestErrorField(loginData, 'defaultLogin')}
+                            errors={ErrorUtils.getLatestErrorField(loginData, isFailedRemovedContactMethod ? 'deletedLogin' : 'defaultLogin')}
                             errorRowStyles={[styles.ml8, styles.mr5]}
-                            onClose={() => User.clearContactMethodErrors(contactMethod, 'defaultLogin')}
+                            onClose={() => User.clearContactMethodErrors(contactMethod, isFailedRemovedContactMethod ? 'deletedLogin' : 'defaultLogin')}
                         >
                             <Text style={[styles.ph5, styles.mv3]}>{this.props.translate('contacts.yourDefaultContactMethod')}</Text>
                         </OfflineWithFeedback>
diff --git a/src/pages/settings/Profile/Contacts/ContactMethodsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodsPage.js
index 62e62183a156..c08ed600b570 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodsPage.js
+++ b/src/pages/settings/Profile/Contacts/ContactMethodsPage.js
@@ -100,7 +100,7 @@ function ContactMethodsPage(props) {
                 <MenuItem
                     title={menuItemTitle}
                     description={description}
-                    onPress={() => Navigation.navigate(ROUTES.getEditContactMethodRoute(partnerUserID))}
+                    onPress={() => Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHOD_DETAILS.getRoute(partnerUserID))}
                     brickRoadIndicator={indicator}
                     shouldShowBasicTitle
                     shouldShowRightIcon
@@ -111,12 +111,15 @@ function ContactMethodsPage(props) {
     });
 
     return (
-        <ScreenWrapper shouldEnableKeyboardAvoidingView={false}>
+        <ScreenWrapper
+            shouldEnableKeyboardAvoidingView={false}
+            testID={ContactMethodsPage.displayName}
+        >
             <HeaderWithBackButton
                 title={props.translate('contacts.contactMethods')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_PROFILE)}
             />
-            <ScrollView>
+            <ScrollView contentContainerStyle={styles.flexGrow1}>
                 <View style={[styles.ph5, styles.mv3, styles.flexRow, styles.flexWrap]}>
                     <Text>
                         {props.translate('contacts.helpTextBeforeEmail')}
@@ -128,15 +131,15 @@ function ContactMethodsPage(props) {
                     </Text>
                 </View>
                 {loginMenuItems}
+                <FixedFooter style={[styles.mtAuto, styles.pt5]}>
+                    <Button
+                        success
+                        text={props.translate('contacts.newContactMethod')}
+                        onPress={() => Navigation.navigate(ROUTES.SETTINGS_NEW_CONTACT_METHOD)}
+                        pressOnEnter
+                    />
+                </FixedFooter>
             </ScrollView>
-            <FixedFooter style={[styles.flexGrow0, styles.pt5]}>
-                <Button
-                    success
-                    text={props.translate('contacts.newContactMethod')}
-                    onPress={() => Navigation.navigate(ROUTES.SETTINGS_NEW_CONTACT_METHOD)}
-                    pressOnEnter
-                />
-            </FixedFooter>
         </ScreenWrapper>
     );
 }
diff --git a/src/pages/settings/Profile/Contacts/NewContactMethodPage.js b/src/pages/settings/Profile/Contacts/NewContactMethodPage.js
index 236b7c1c73aa..cce43117d4f2 100644
--- a/src/pages/settings/Profile/Contacts/NewContactMethodPage.js
+++ b/src/pages/settings/Profile/Contacts/NewContactMethodPage.js
@@ -98,6 +98,7 @@ function NewContactMethodPage(props) {
             }}
             includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
+            testID={NewContactMethodPage.displayName}
         >
             <HeaderWithBackButton
                 title={props.translate('contacts.newContactMethod')}
@@ -132,6 +133,7 @@ function NewContactMethodPage(props) {
 
 NewContactMethodPage.propTypes = propTypes;
 NewContactMethodPage.defaultProps = defaultProps;
+NewContactMethodPage.displayName = 'NewContactMethodPage';
 
 export default compose(
     withLocalize,
diff --git a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js
index 973a0475846d..300bd23cc2e5 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() {
@@ -110,6 +111,7 @@ function BaseValidateCodeForm(props) {
     const resendValidateCode = () => {
         User.requestContactMethodValidateCode(props.contactMethod);
         setValidateCode('');
+        inputValidateCodeRef.current.clear();
         inputValidateCodeRef.current.focus();
     };
 
@@ -170,7 +172,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 +181,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..0fa231aec6f1 100644
--- a/src/pages/settings/Profile/CustomStatus/StatusPage.js
+++ b/src/pages/settings/Profile/CustomStatus/StatusPage.js
@@ -2,15 +2,14 @@ import React, {useMemo, useCallback, useEffect} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import lodashGet from 'lodash/get';
-import moment from 'moment';
 import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes} from '../../../../components/withCurrentUserPersonalDetails';
 import MenuItemWithTopDescription from '../../../../components/MenuItemWithTopDescription';
-import StaticHeaderPageLayout from '../../../../components/StaticHeaderPageLayout';
+import HeaderPageLayout from '../../../../components/HeaderPageLayout';
 import * as Expensicons from '../../../../components/Icon/Expensicons';
 import withLocalize from '../../../../components/withLocalize';
-import MenuItem from '../../../../components/MenuItem';
 import Button from '../../../../components/Button';
 import Text from '../../../../components/Text';
+import MenuItem from '../../../../components/MenuItem';
 import Navigation from '../../../../libs/Navigation/Navigation';
 import * as User from '../../../../libs/actions/User';
 import MobileBackgroundImage from '../../../../../assets/images/money-stack.svg';
@@ -20,6 +19,7 @@ import styles from '../../../../styles/styles';
 import compose from '../../../../libs/compose';
 import ONYXKEYS from '../../../../ONYXKEYS';
 import ROUTES from '../../../../ROUTES';
+import SCREENS from '../../../../SCREENS';
 
 const propTypes = {
     ...withCurrentUserPersonalDetailsPropTypes,
@@ -34,8 +34,16 @@ function StatusPage({draftStatus, currentUserPersonalDetails}) {
 
     const defaultEmoji = draftEmojiCode || currentUserEmojiCode;
     const defaultText = draftEmojiCode ? draftText : currentUserStatusText;
-    const customStatus = draftEmojiCode ? `${draftEmojiCode} ${draftText}` : `${currentUserEmojiCode || ''} ${currentUserStatusText || ''}`;
     const hasDraftStatus = !!draftEmojiCode || !!draftText;
+    const customStatus = useMemo(() => {
+        if (draftEmojiCode) {
+            return `${draftEmojiCode} ${draftText}`;
+        }
+        if (currentUserEmojiCode || currentUserStatusText) {
+            return `${currentUserEmojiCode || ''} ${currentUserStatusText || ''}`;
+        }
+        return '';
+    }, [draftEmojiCode, draftText, currentUserEmojiCode, currentUserStatusText]);
 
     const clearStatus = () => {
         User.clearCustomStatus();
@@ -44,8 +52,7 @@ function StatusPage({draftStatus, currentUserPersonalDetails}) {
 
     const navigateBackToSettingsPage = useCallback(() => Navigation.goBack(ROUTES.SETTINGS_PROFILE, false, true), []);
     const updateStatus = useCallback(() => {
-        const endOfDay = moment().endOf('day').format('YYYY-MM-DD HH:mm:ss');
-        User.updateCustomStatus({text: defaultText, emojiCode: defaultEmoji, clearAfter: endOfDay});
+        User.updateCustomStatus({text: defaultText, emojiCode: defaultEmoji});
 
         User.clearDraftCustomStatus();
         Navigation.goBack(ROUTES.SETTINGS_PROFILE);
@@ -65,14 +72,20 @@ function StatusPage({draftStatus, currentUserPersonalDetails}) {
     useEffect(() => () => User.clearDraftCustomStatus(), []);
 
     return (
-        <StaticHeaderPageLayout
+        <HeaderPageLayout
             title={localize.translate('statusPage.status')}
             onBackButtonPress={navigateBackToSettingsPage}
-            backgroundColor={themeColors.midtone}
-            image={MobileBackgroundImage}
+            headerContent={
+                <MobileBackgroundImage
+                    pointerEvents="none"
+                    style={styles.staticHeaderImage}
+                />
+            }
+            headerContainerStyles={[styles.staticHeaderImage]}
+            backgroundColor={themeColors.PAGE_BACKGROUND_COLORS[SCREENS.SETTINGS.STATUS]}
             footer={footerComponent}
         >
-            <View style={styles.m5}>
+            <View style={[styles.mh5, styles.mb5]}>
                 <Text style={[styles.textHeadline]}>{localize.translate('statusPage.setStatusTitle')}</Text>
                 <Text style={[styles.textNormal, styles.mt2]}>{localize.translate('statusPage.statusExplanation')}</Text>
             </View>
@@ -87,13 +100,14 @@ function StatusPage({draftStatus, currentUserPersonalDetails}) {
             {(!!currentUserEmojiCode || !!currentUserStatusText) && (
                 <MenuItem
                     title={localize.translate('statusPage.clearStatus')}
+                    titleStyle={styles.ml0}
                     icon={Expensicons.Close}
                     onPress={clearStatus}
                     iconFill={themeColors.danger}
-                    wrapperStyle={[styles.cardMenuItem]}
+                    wrapperStyle={[styles.pl2]}
                 />
             )}
-        </StaticHeaderPageLayout>
+        </HeaderPageLayout>
     );
 }
 
diff --git a/src/pages/settings/Profile/CustomStatus/StatusSetPage.js b/src/pages/settings/Profile/CustomStatus/StatusSetPage.js
index 7074ce45a7bb..189ec3e5f2f3 100644
--- a/src/pages/settings/Profile/CustomStatus/StatusSetPage.js
+++ b/src/pages/settings/Profile/CustomStatus/StatusSetPage.js
@@ -47,7 +47,7 @@ function StatusSetPage({draftStatus, currentUserPersonalDetails}) {
     };
 
     return (
-        <ScreenWrapper>
+        <ScreenWrapper testID={StatusSetPage.displayName}>
             <HeaderWithBackButton
                 title={translate('statusPage.status')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_STATUS)}
diff --git a/src/pages/settings/Profile/DisplayNamePage.js b/src/pages/settings/Profile/DisplayNamePage.js
index d93eeed2689c..386648bb69b9 100644
--- a/src/pages/settings/Profile/DisplayNamePage.js
+++ b/src/pages/settings/Profile/DisplayNamePage.js
@@ -1,11 +1,10 @@
 import lodashGet from 'lodash/get';
 import React from 'react';
 import {View} from 'react-native';
-import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes, withCurrentUserPersonalDetailsDefaultProps} from '../../../components/withCurrentUserPersonalDetails';
+import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes} from '../../../components/withCurrentUserPersonalDetails';
 import ScreenWrapper from '../../../components/ScreenWrapper';
 import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
 import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
-import Form from '../../../components/Form';
 import ONYXKEYS from '../../../ONYXKEYS';
 import CONST from '../../../CONST';
 import * as ValidationUtils from '../../../libs/ValidationUtils';
@@ -17,6 +16,8 @@ import compose from '../../../libs/compose';
 import * as ErrorUtils from '../../../libs/ErrorUtils';
 import ROUTES from '../../../ROUTES';
 import Navigation from '../../../libs/Navigation/Navigation';
+import FormProvider from '../../../components/Form/FormProvider';
+import InputWrapper from '../../../components/Form/InputWrapper';
 
 const propTypes = {
     ...withLocalizePropTypes,
@@ -61,7 +62,6 @@ function DisplayNamePage(props) {
         if (!ValidationUtils.isValidDisplayName(values.lastName)) {
             errors.lastName = 'personalDetails.error.hasInvalidCharacter';
         }
-
         return errors;
     };
 
@@ -69,22 +69,26 @@ function DisplayNamePage(props) {
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
+            testID={DisplayNamePage.displayName}
         >
             <HeaderWithBackButton
                 title={props.translate('displayNamePage.headerTitle')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_PROFILE)}
             />
-            <Form
+            <FormProvider
                 style={[styles.flexGrow1, styles.ph5]}
                 formID={ONYXKEYS.FORMS.DISPLAY_NAME_FORM}
                 validate={validate}
                 onSubmit={updateDisplayName}
                 submitButtonText={props.translate('common.save')}
                 enabledWhenOffline
+                shouldValidateOnBlur
+                shouldValidateOnChange
             >
                 <Text style={[styles.mb6]}>{props.translate('displayNamePage.isShownOnProfile')}</Text>
                 <View style={styles.mb4}>
-                    <TextInput
+                    <InputWrapper
+                        InputComponent={TextInput}
                         inputID="firstName"
                         name="fname"
                         label={props.translate('common.firstName')}
@@ -96,7 +100,8 @@ function DisplayNamePage(props) {
                     />
                 </View>
                 <View>
-                    <TextInput
+                    <InputWrapper
+                        InputComponent={TextInput}
                         inputID="lastName"
                         name="lname"
                         label={props.translate('common.lastName')}
@@ -107,7 +112,7 @@ function DisplayNamePage(props) {
                         spellCheck={false}
                     />
                 </View>
-            </Form>
+            </FormProvider>
         </ScreenWrapper>
     );
 }
diff --git a/src/pages/settings/Profile/LoungeAccessPage.js b/src/pages/settings/Profile/LoungeAccessPage.js
index 36bb692598fc..81d63592211b 100644
--- a/src/pages/settings/Profile/LoungeAccessPage.js
+++ b/src/pages/settings/Profile/LoungeAccessPage.js
@@ -1,5 +1,7 @@
 import React from 'react';
+import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
+import PropTypes from 'prop-types';
 import Navigation from '../../../libs/Navigation/Navigation';
 import ROUTES from '../../../ROUTES';
 import * as Illustrations from '../../../components/Icon/Illustrations';
@@ -10,14 +12,34 @@ import useLocalize from '../../../hooks/useLocalize';
 import FeatureList from '../../../components/FeatureList';
 import IllustratedHeaderPageLayout from '../../../components/IllustratedHeaderPageLayout';
 import * as LottieAnimations from '../../../components/LottieAnimations';
+import compose from '../../../libs/compose';
+import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes} from '../../../components/withCurrentUserPersonalDetails';
+import LinearGradient from '../../../components/LinearGradient';
+import styles from '../../../styles/styles';
+import Avatar from '../../../components/Avatar';
+import Text from '../../../components/Text';
+import * as UserUtils from '../../../libs/UserUtils';
+import CONST from '../../../CONST';
+import themeColors from '../../../styles/themes/default';
+import * as LocalePhoneNumber from '../../../libs/LocalePhoneNumber';
 
 const propTypes = {
+    /** The session of the logged in person */
+    session: PropTypes.shape({
+        /** Email of the logged in person */
+        email: PropTypes.string,
+    }),
+
     /** Current user details, which will hold whether or not they have Lounge Access */
     user: userPropTypes,
+
+    ...withCurrentUserPersonalDetailsPropTypes,
 };
 
 const defaultProps = {
+    session: {},
     user: {},
+    ...withCurrentUserPersonalDetailsDefaultProps,
 };
 
 const menuItems = [
@@ -35,18 +57,47 @@ const menuItems = [
     },
 ];
 
-function LoungeAccessPage({user}) {
+function LoungeAccessPage(props) {
     const {translate} = useLocalize();
 
-    if (!user.hasLoungeAccess) {
+    if (!props.user.hasLoungeAccess) {
         return <NotFoundPage />;
     }
 
+    const overlayContent = () => (
+        <LinearGradient
+            colors={[`${themeColors.loungeAccessOverlay}00`, themeColors.loungeAccessOverlay]}
+            style={[styles.pAbsolute, styles.w100, styles.h100]}
+        >
+            <View style={[styles.flex1, styles.justifyContentCenter, styles.alignItemsCenter, styles.pt5, styles.ph5]}>
+                <Avatar
+                    imageStyles={[styles.avatarLarge]}
+                    source={UserUtils.getAvatar(props.currentUserPersonalDetails.avatar, props.session.accountID)}
+                    size={CONST.AVATAR_SIZE.LARGE}
+                    fallbackIcon={props.currentUserPersonalDetails.fallbackIcon}
+                />
+                <Text
+                    style={[styles.textHeadline, styles.pre, styles.mt2]}
+                    numberOfLines={1}
+                >
+                    {props.currentUserPersonalDetails.displayName ? props.currentUserPersonalDetails.displayName : LocalePhoneNumber.formatPhoneNumber(props.session.email)}
+                </Text>
+                <Text
+                    style={[styles.textLabelSupporting, styles.mt1]}
+                    numberOfLines={1}
+                >
+                    {LocalePhoneNumber.formatPhoneNumber(props.session.email)}
+                </Text>
+            </View>
+        </LinearGradient>
+    );
+
     return (
         <IllustratedHeaderPageLayout
             title={translate('loungeAccessPage.loungeAccess')}
             onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS)}
             illustration={LottieAnimations.ExpensifyLounge}
+            overlayContent={overlayContent}
         >
             <FeatureList
                 headline="loungeAccessPage.headline"
@@ -61,8 +112,14 @@ LoungeAccessPage.propTypes = propTypes;
 LoungeAccessPage.defaultProps = defaultProps;
 LoungeAccessPage.displayName = 'LoungeAccessPage';
 
-export default withOnyx({
-    user: {
-        key: ONYXKEYS.USER,
-    },
-})(LoungeAccessPage);
+export default compose(
+    withCurrentUserPersonalDetails,
+    withOnyx({
+        session: {
+            key: ONYXKEYS.SESSION,
+        },
+        user: {
+            key: ONYXKEYS.USER,
+        },
+    }),
+)(LoungeAccessPage);
diff --git a/src/pages/settings/Profile/PersonalDetails/AddressPage.js b/src/pages/settings/Profile/PersonalDetails/AddressPage.js
index 886e207bf68a..7dadbb4608d9 100644
--- a/src/pages/settings/Profile/PersonalDetails/AddressPage.js
+++ b/src/pages/settings/Profile/PersonalDetails/AddressPage.js
@@ -1,6 +1,6 @@
 import lodashGet from 'lodash/get';
 import _ from 'underscore';
-import React, {useState, useCallback} from 'react';
+import React, {useState, useCallback, useEffect} from 'react';
 import PropTypes from 'prop-types';
 import {View} from 'react-native';
 import {CONST as COMMON_CONST} from 'expensify-common/lib/CONST';
@@ -15,13 +15,13 @@ import styles from '../../../../styles/styles';
 import * as PersonalDetails from '../../../../libs/actions/PersonalDetails';
 import * as ValidationUtils from '../../../../libs/ValidationUtils';
 import AddressSearch from '../../../../components/AddressSearch';
-import CountryPicker from '../../../../components/CountryPicker';
 import StatePicker from '../../../../components/StatePicker';
 import Navigation from '../../../../libs/Navigation/Navigation';
 import ROUTES from '../../../../ROUTES';
 import useLocalize from '../../../../hooks/useLocalize';
 import usePrivatePersonalDetails from '../../../../hooks/usePrivatePersonalDetails';
 import FullscreenLoadingIndicator from '../../../../components/FullscreenLoadingIndicator';
+import CountrySelector from '../../../../components/CountrySelector';
 
 const propTypes = {
     /* Onyx Props */
@@ -37,6 +37,15 @@ const propTypes = {
             country: PropTypes.string,
         }),
     }),
+
+    /** Route from navigation */
+    route: PropTypes.shape({
+        /** Params from the route */
+        params: PropTypes.shape({
+            /** Currently selected country */
+            country: PropTypes.string,
+        }),
+    }).isRequired,
 };
 
 const defaultProps = {
@@ -59,10 +68,11 @@ function updateAddress(values) {
     PersonalDetails.updateAddress(values.addressLine1.trim(), values.addressLine2.trim(), values.city.trim(), values.state.trim(), values.zipPostCode.trim().toUpperCase(), values.country);
 }
 
-function AddressPage({privatePersonalDetails}) {
+function AddressPage({privatePersonalDetails, route}) {
     usePrivatePersonalDetails();
     const {translate} = useLocalize();
-    const [currentCountry, setCurrentCountry] = useState(PersonalDetails.getCountryISO(lodashGet(privatePersonalDetails, 'address.country')));
+    const countryFromUrl = lodashGet(route, 'params.country');
+    const [currentCountry, setCurrentCountry] = useState(countryFromUrl || PersonalDetails.getCountryISO(lodashGet(privatePersonalDetails, 'address.country')));
     const isUSAForm = currentCountry === CONST.COUNTRY.US;
     const zipSampleFormat = lodashGet(CONST.COUNTRY_ZIP_REGEX_DATA, [currentCountry, 'samples'], '');
     const zipFormat = translate('common.zipCodeExampleFormat', {zipSampleFormat});
@@ -116,7 +126,7 @@ function AddressPage({privatePersonalDetails}) {
         return errors;
     }, []);
 
-    const handleAddressChange = (value, key) => {
+    const handleAddressChange = useCallback((value, key) => {
         if (key !== 'country' && key !== 'state') {
             return;
         }
@@ -126,10 +136,20 @@ function AddressPage({privatePersonalDetails}) {
             return;
         }
         setState(value);
-    };
+    }, []);
+
+    useEffect(() => {
+        if (!countryFromUrl || countryFromUrl === currentCountry) {
+            return;
+        }
+        handleAddressChange(countryFromUrl, 'country');
+    }, [countryFromUrl, handleAddressChange, currentCountry]);
 
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={AddressPage.displayName}
+        >
             <HeaderWithBackButton
                 title={translate('privatePersonalDetails.homeAddress')}
                 shouldShowBackButton
@@ -175,10 +195,9 @@ function AddressPage({privatePersonalDetails}) {
                     />
                     <View style={styles.formSpaceVertical} />
                     <View style={styles.mhn5}>
-                        <CountryPicker
+                        <CountrySelector
                             inputID="country"
-                            defaultValue={currentCountry}
-                            onValueChange={handleAddressChange}
+                            value={currentCountry}
                         />
                     </View>
                     <View style={styles.formSpaceVertical} />
@@ -231,6 +250,7 @@ function AddressPage({privatePersonalDetails}) {
 
 AddressPage.propTypes = propTypes;
 AddressPage.defaultProps = defaultProps;
+AddressPage.displayName = 'AddressPage';
 
 export default withOnyx({
     privatePersonalDetails: {
diff --git a/src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.js b/src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.js
new file mode 100644
index 000000000000..741974776df1
--- /dev/null
+++ b/src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.js
@@ -0,0 +1,107 @@
+import React, {useState, useMemo, useCallback} from 'react';
+import PropTypes from 'prop-types';
+import _ from 'underscore';
+import lodashGet from 'lodash/get';
+import Navigation from '../../../../libs/Navigation/Navigation';
+import ScreenWrapper from '../../../../components/ScreenWrapper';
+import HeaderWithBackButton from '../../../../components/HeaderWithBackButton';
+import SelectionList from '../../../../components/SelectionList';
+import searchCountryOptions from '../../../../libs/searchCountryOptions';
+import StringUtils from '../../../../libs/StringUtils';
+import CONST from '../../../../CONST';
+import useLocalize from '../../../../hooks/useLocalize';
+
+const propTypes = {
+    /** Route from navigation */
+    route: PropTypes.shape({
+        /** Params from the route */
+        params: PropTypes.shape({
+            /** Currently selected country */
+            country: PropTypes.string,
+
+            /** Route to navigate back after selecting a currency */
+            backTo: PropTypes.string,
+        }),
+    }).isRequired,
+
+    /** Navigation from react-navigation */
+    navigation: PropTypes.shape({
+        /** getState function retrieves the current navigation state from react-navigation's navigation property */
+        getState: PropTypes.func.isRequired,
+    }).isRequired,
+};
+
+function CountrySelectionPage({route, navigation}) {
+    const [searchValue, setSearchValue] = useState('');
+    const {translate} = useLocalize();
+    const currentCountry = lodashGet(route, 'params.country');
+
+    const countries = useMemo(
+        () =>
+            _.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],
+    );
+
+    const searchResults = searchCountryOptions(searchValue, countries);
+    const headerMessage = searchValue.trim() && !searchResults.length ? translate('common.noResultsFound') : '';
+
+    const selectCountry = useCallback(
+        (option) => {
+            const backTo = lodashGet(route, 'params.backTo', '');
+
+            // Check the navigation state and "backTo" parameter to decide navigation behavior
+            if (navigation.getState().routes.length === 1 && _.isEmpty(backTo)) {
+                // If there is only one route and "backTo" is empty, go back in navigation
+                Navigation.goBack();
+            } else if (!_.isEmpty(backTo) && navigation.getState().routes.length === 1) {
+                // If "backTo" is not empty and there is only one route, go back to the specific route defined in "backTo" with a country parameter
+                Navigation.goBack(`${route.params.backTo}?country=${option.value}`);
+            } else {
+                // Otherwise, navigate to the specific route defined in "backTo" with a country parameter
+                Navigation.navigate(`${route.params.backTo}?country=${option.value}`);
+            }
+        },
+        [route, navigation],
+    );
+
+    return (
+        <ScreenWrapper
+            testID={CountrySelectionPage.displayName}
+            includeSafeAreaPaddingBottom={false}
+        >
+            <HeaderWithBackButton
+                title={translate('common.country')}
+                shouldShowBackButton
+                onBackButtonPress={() => {
+                    const backTo = lodashGet(route, 'params.backTo', '');
+                    const backToRoute = backTo ? `${backTo}?country=${currentCountry}` : '';
+                    Navigation.goBack(backToRoute);
+                }}
+            />
+
+            <SelectionList
+                headerMessage={headerMessage}
+                textInputLabel={translate('common.country')}
+                textInputValue={searchValue}
+                sections={[{data: searchResults, indexOffset: 0}]}
+                onSelectRow={selectCountry}
+                onChangeText={setSearchValue}
+                initiallyFocusedOptionKey={currentCountry}
+            />
+        </ScreenWrapper>
+    );
+}
+
+CountrySelectionPage.displayName = 'CountrySelectionPage';
+CountrySelectionPage.propTypes = propTypes;
+
+export default CountrySelectionPage;
diff --git a/src/pages/settings/Profile/PersonalDetails/DateOfBirthPage.js b/src/pages/settings/Profile/PersonalDetails/DateOfBirthPage.js
index 22346a48658d..8b4406329616 100644
--- a/src/pages/settings/Profile/PersonalDetails/DateOfBirthPage.js
+++ b/src/pages/settings/Profile/PersonalDetails/DateOfBirthPage.js
@@ -61,7 +61,10 @@ function DateOfBirthPage({translate, privatePersonalDetails}) {
     }, []);
 
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={DateOfBirthPage.displayName}
+        >
             <HeaderWithBackButton
                 title={translate('common.dob')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_PERSONAL_DETAILS)}
diff --git a/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js b/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js
index 0caf20a3e128..725c3f4ffbb9 100644
--- a/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js
+++ b/src/pages/settings/Profile/PersonalDetails/LegalNamePage.js
@@ -71,6 +71,7 @@ function LegalNamePage(props) {
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
+            testID={LegalNamePage.displayName}
         >
             <HeaderWithBackButton
                 title={props.translate('privatePersonalDetails.legalName')}
@@ -119,6 +120,7 @@ function LegalNamePage(props) {
 
 LegalNamePage.propTypes = propTypes;
 LegalNamePage.defaultProps = defaultProps;
+LegalNamePage.displayName = 'LegalNamePage';
 
 export default compose(
     withLocalize,
diff --git a/src/pages/settings/Profile/PersonalDetails/PersonalDetailsInitialPage.js b/src/pages/settings/Profile/PersonalDetails/PersonalDetailsInitialPage.js
index e1c4f14047a2..faac43e52656 100644
--- a/src/pages/settings/Profile/PersonalDetails/PersonalDetailsInitialPage.js
+++ b/src/pages/settings/Profile/PersonalDetails/PersonalDetailsInitialPage.js
@@ -85,7 +85,7 @@ function PersonalDetailsInitialPage(props) {
     };
 
     return (
-        <ScreenWrapper>
+        <ScreenWrapper testID={PersonalDetailsInitialPage.displayName}>
             <HeaderWithBackButton
                 title={props.translate('privatePersonalDetails.personalDetails')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_PROFILE)}
diff --git a/src/pages/settings/Profile/ProfilePage.js b/src/pages/settings/Profile/ProfilePage.js
index 1f89756353ff..77e21274cfea 100755
--- a/src/pages/settings/Profile/ProfilePage.js
+++ b/src/pages/settings/Profile/ProfilePage.js
@@ -57,10 +57,16 @@ function ProfilePage(props) {
         if (pronounsKey.startsWith(CONST.PRONOUNS.PREFIX)) {
             pronounsKey = pronounsKey.slice(CONST.PRONOUNS.PREFIX.length);
         }
-        return lodashGet(props.translate('pronouns'), pronounsKey, props.translate('profilePage.selectYourPronouns'));
+
+        if (!pronounsKey) {
+            return props.translate('profilePage.selectYourPronouns');
+        }
+        return props.translate(`pronouns.${pronounsKey}`);
     };
     const currentUserDetails = props.currentUserPersonalDetails || {};
     const contactMethodBrickRoadIndicator = UserUtils.getLoginListBrickRoadIndicator(props.loginList);
+    const avatarURL = lodashGet(currentUserDetails, 'avatar', '');
+    const accountID = lodashGet(currentUserDetails, 'accountID', '');
     const emojiCode = lodashGet(props, 'currentUserPersonalDetails.status.emojiCode', '');
 
     const profileSettingsOptions = [
@@ -101,7 +107,10 @@ function ProfilePage(props) {
     }, [props.currentUserPersonalDetails]);
 
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={ProfilePage.displayName}
+        >
             <HeaderWithBackButton
                 title={props.translate('common.profile')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS)}
@@ -109,7 +118,7 @@ function ProfilePage(props) {
             <ScrollView>
                 <AvatarWithImagePicker
                     isUsingDefaultAvatar={UserUtils.isDefaultAvatar(lodashGet(currentUserDetails, 'avatar', ''))}
-                    source={UserUtils.getAvatar(lodashGet(currentUserDetails, 'avatar', ''), lodashGet(currentUserDetails, 'accountID', ''))}
+                    source={UserUtils.getAvatar(avatarURL, accountID)}
                     onImageSelected={PersonalDetails.updateAvatar}
                     onImageRemoved={PersonalDetails.deleteAvatar}
                     anchorPosition={styles.createMenuPositionProfile(props.windowWidth)}
@@ -119,7 +128,11 @@ function ProfilePage(props) {
                     errors={lodashGet(props.currentUserPersonalDetails, 'errorFields.avatar', null)}
                     errorRowStyles={[styles.mt6]}
                     onErrorClose={PersonalDetails.clearAvatarErrors}
+                    previewSource={UserUtils.getFullSizeAvatar(avatarURL, accountID)}
+                    originalFileName={currentUserDetails.originalFileName}
+                    headerTitle={props.translate('profilePage.profileAvatar')}
                     style={[styles.mh5]}
+                    fallbackIcon={lodashGet(currentUserDetails, 'fallbackIcon')}
                 />
                 <View style={[styles.mt4]}>
                     {_.map(profileSettingsOptions, (detail, index) => (
diff --git a/src/pages/settings/Profile/PronounsPage.js b/src/pages/settings/Profile/PronounsPage.js
index ce460bc30ff4..dbfd067de4bb 100644
--- a/src/pages/settings/Profile/PronounsPage.js
+++ b/src/pages/settings/Profile/PronounsPage.js
@@ -1,21 +1,19 @@
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
-import React, {useState, useEffect, useCallback} from 'react';
+import React, {useState, useMemo} from 'react';
 import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes, withCurrentUserPersonalDetailsDefaultProps} from '../../../components/withCurrentUserPersonalDetails';
 import ScreenWrapper from '../../../components/ScreenWrapper';
 import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
-import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
 import Text from '../../../components/Text';
 import styles from '../../../styles/styles';
 import * as PersonalDetails from '../../../libs/actions/PersonalDetails';
-import compose from '../../../libs/compose';
 import CONST from '../../../CONST';
 import ROUTES from '../../../ROUTES';
 import Navigation from '../../../libs/Navigation/Navigation';
 import SelectionList from '../../../components/SelectionList';
+import useLocalize from '../../../hooks/useLocalize';
 
 const propTypes = {
-    ...withLocalizePropTypes,
     ...withCurrentUserPersonalDetailsPropTypes,
 };
 
@@ -23,95 +21,69 @@ const defaultProps = {
     ...withCurrentUserPersonalDetailsDefaultProps,
 };
 
-function PronounsPage(props) {
-    const [initiallyFocusedOption, setInitiallyFocusedOption] = useState({});
-    const [searchValue, setSearchValue] = useState('');
-    const [pronounsList, setPronounsList] = useState([]);
+function PronounsPage({currentUserPersonalDetails}) {
+    const {translate} = useLocalize();
+    const currentPronouns = lodashGet(currentUserPersonalDetails, 'pronouns', '');
+    const currentPronounsKey = currentPronouns.substring(CONST.PRONOUNS.PREFIX.length);
 
-    /**
-     * Loads the pronouns list from the translations and adds the green checkmark icon to the currently selected value.
-     *
-     * @returns {void}
-     */
-    const loadPronouns = useCallback(() => {
-        const currentPronouns = lodashGet(props.currentUserPersonalDetails, 'pronouns', '');
+    const [searchValue, setSearchValue] = useState(() => {
+        const currentPronounsText = _.chain(CONST.PRONOUNS_LIST)
+            .find((_value) => _value === currentPronounsKey)
+            .value();
 
-        const pronouns = _.chain(props.translate('pronouns'))
-            .map((value, key) => {
-                const fullPronounKey = `${CONST.PRONOUNS.PREFIX}${key}`;
-                const isCurrentPronouns = fullPronounKey === currentPronouns;
+        return currentPronounsText ? translate(`pronouns.${currentPronounsText}`) : '';
+    });
 
-                if (isCurrentPronouns) {
-                    setInitiallyFocusedOption({
-                        text: value,
-                        keyForList: key,
-                    });
-                }
+    const filteredPronounsList = useMemo(() => {
+        const pronouns = _.chain(CONST.PRONOUNS_LIST)
+            .map((value) => {
+                const fullPronounKey = `${CONST.PRONOUNS.PREFIX}${value}`;
+                const isCurrentPronouns = fullPronounKey === currentPronouns;
 
                 return {
-                    text: value,
+                    text: translate(`pronouns.${value}`),
                     value: fullPronounKey,
-                    keyForList: key,
+                    keyForList: value,
                     isSelected: isCurrentPronouns,
                 };
             })
             .sortBy((pronoun) => pronoun.text.toLowerCase())
             .value();
 
-        setPronounsList(pronouns);
+        const trimmedSearch = searchValue.trim();
 
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [props.currentUserPersonalDetails.pronouns]);
+        if (trimmedSearch.length === 0) {
+            return [];
+        }
+        return _.filter(pronouns, (pronoun) => pronoun.text.toLowerCase().indexOf(trimmedSearch.toLowerCase()) >= 0);
+    }, [searchValue, currentPronouns, translate]);
 
-    const onChangeText = (value = '') => {
-        setSearchValue(value);
-    };
+    const headerMessage = searchValue.trim() && filteredPronounsList.length === 0 ? translate('common.noResultsFound') : '';
 
-    /**
-     * @param {Object} selectedPronouns
-     */
     const updatePronouns = (selectedPronouns) => {
-        PersonalDetails.updatePronouns(selectedPronouns.keyForList === initiallyFocusedOption.keyForList ? '' : lodashGet(selectedPronouns, 'value', ''));
+        PersonalDetails.updatePronouns(selectedPronouns.keyForList === currentPronounsKey ? '' : lodashGet(selectedPronouns, 'value', ''));
     };
 
-    /**
-     * Pronouns list filtered by searchValue needed for the OptionsSelector.
-     * Empty array if the searchValue is empty.
-     */
-    const filteredPronounsList = _.filter(pronounsList, (pronous) => pronous.text.toLowerCase().indexOf(searchValue.trim().toLowerCase()) >= 0);
-
-    const headerMessage = searchValue.trim() && !filteredPronounsList.length ? props.translate('common.noResultsFound') : '';
-
-    useEffect(() => {
-        setSearchValue(initiallyFocusedOption.text);
-    }, [initiallyFocusedOption]);
-
-    useEffect(() => {
-        onChangeText();
-        loadPronouns();
-    }, [loadPronouns]);
-
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={PronounsPage.displayName}
+        >
             <HeaderWithBackButton
-                title={props.translate('pronounsPage.pronouns')}
+                title={translate('pronounsPage.pronouns')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_PROFILE)}
             />
-            <Text style={[styles.ph5, styles.mb3]}>{props.translate('pronounsPage.isShownOnProfile')}</Text>
-            {/* Only render pronouns if list was loaded (not filtered list), otherwise initially focused item will be empty */}
-            {pronounsList.length > 0 && (
-                <SelectionList
-                    headerMessage={headerMessage}
-                    textInputLabel={props.translate('pronounsPage.pronouns')}
-                    textInputPlaceholder={props.translate('pronounsPage.placeholderText')}
-                    textInputValue={searchValue}
-                    sections={[{data: filteredPronounsList, indexOffset: 0}]}
-                    onSelectRow={updatePronouns}
-                    onChangeText={onChangeText}
-                    initiallyFocusedOptionKey={initiallyFocusedOption.keyForList}
-                    shouldDelayFocus
-                />
-            )}
+            <Text style={[styles.ph5, styles.mb3]}>{translate('pronounsPage.isShownOnProfile')}</Text>
+            <SelectionList
+                headerMessage={headerMessage}
+                textInputLabel={translate('pronounsPage.pronouns')}
+                textInputPlaceholder={translate('pronounsPage.placeholderText')}
+                textInputValue={searchValue}
+                sections={[{data: filteredPronounsList, indexOffset: 0}]}
+                onSelectRow={updatePronouns}
+                onChangeText={setSearchValue}
+                initiallyFocusedOptionKey={currentPronounsKey}
+            />
         </ScreenWrapper>
     );
 }
@@ -120,4 +92,4 @@ PronounsPage.propTypes = propTypes;
 PronounsPage.defaultProps = defaultProps;
 PronounsPage.displayName = 'PronounsPage';
 
-export default compose(withLocalize, withCurrentUserPersonalDetails)(PronounsPage);
+export default withCurrentUserPersonalDetails(PronounsPage);
diff --git a/src/pages/settings/Profile/TimezoneInitialPage.js b/src/pages/settings/Profile/TimezoneInitialPage.js
index 7dfc9fb6f9de..5fd5e1bd7661 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,12 +36,12 @@ 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,
         });
     };
 
     return (
-        <ScreenWrapper>
+        <ScreenWrapper testID={TimezoneInitialPage.displayName}>
             <HeaderWithBackButton
                 title={props.translate('timezonePage.timezone')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_PROFILE)}
diff --git a/src/pages/settings/Profile/TimezoneSelectPage.js b/src/pages/settings/Profile/TimezoneSelectPage.js
index c4fdda42114f..2c47acd58daa 100644
--- a/src/pages/settings/Profile/TimezoneSelectPage.js
+++ b/src/pages/settings/Profile/TimezoneSelectPage.js
@@ -78,19 +78,22 @@ function TimezoneSelectPage(props) {
     };
 
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={TimezoneSelectPage.displayName}
+        >
             <HeaderWithBackButton
                 title={translate('timezonePage.timezone')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_TIMEZONE)}
             />
             <SelectionList
+                headerMessage={timezoneInputText.trim() && !timezoneOptions.length ? translate('common.noResultsFound') : ''}
                 textInputLabel={translate('timezonePage.timezone')}
                 textInputValue={timezoneInputText}
                 onChangeText={filterShownTimezones}
                 onSelectRow={saveSelectedTimezone}
                 sections={[{data: timezoneOptions, indexOffset: 0, isDisabled: timezone.automatic}]}
                 initiallyFocusedOptionKey={_.get(_.filter(timezoneOptions, (tz) => tz.text === timezone.selected)[0], 'keyForList')}
-                shouldDelayFocus
                 showScrollIndicator
             />
         </ScreenWrapper>
@@ -99,5 +102,6 @@ function TimezoneSelectPage(props) {
 
 TimezoneSelectPage.propTypes = propTypes;
 TimezoneSelectPage.defaultProps = defaultProps;
+TimezoneSelectPage.displayName = 'TimezoneSelectPage';
 
 export default withCurrentUserPersonalDetails(TimezoneSelectPage);
diff --git a/src/pages/settings/Report/NotificationPreferencePage.js b/src/pages/settings/Report/NotificationPreferencePage.js
index 9765cf1ae0b4..a69b227470d6 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,28 +27,34 @@ 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}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={NotificationPreferencePage.displayName}
+        >
             <FullPageNotFoundView shouldShow={shouldDisableNotificationPreferences}>
                 <HeaderWithBackButton
                     title={props.translate('notificationPreferencesPage.header')}
-                    onBackButtonPress={() => Navigation.goBack(ROUTES.getReportSettingsRoute(props.report.reportID))}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(props.report.reportID))}
                 />
                 <OptionsList
                     sections={[{data: notificationPreferenceOptions}]}
-                    onSelectRow={(option) => Report.updateNotificationPreferenceAndNavigate(props.report.reportID, props.report.notificationPreference, option.value)}
+                    onSelectRow={(option) => Report.updateNotificationPreference(props.report.reportID, props.report.notificationPreference, option.value, true)}
                     hideSectionHeaders
                     optionHoveredStyle={{
                         ...styles.hoveredComponentBG,
diff --git a/src/pages/settings/Report/ReportSettingsPage.js b/src/pages/settings/Report/ReportSettingsPage.js
index c2bd69028a44..3db6bef16e30 100644
--- a/src/pages/settings/Report/ReportSettingsPage.js
+++ b/src/pages/settings/Report/ReportSettingsPage.js
@@ -75,11 +75,11 @@ function ReportSettingsPage(props) {
     const shouldAllowWriteCapabilityEditing = lodashGet(linkedWorkspace, 'role', '') === CONST.POLICY.ROLE.ADMIN && !ReportUtils.isAdminRoom(report);
 
     return (
-        <ScreenWrapper>
+        <ScreenWrapper testID={ReportSettingsPage.displayName}>
             <FullPageNotFoundView shouldShow={shouldDisableSettings}>
                 <HeaderWithBackButton
                     title={translate('common.settings')}
-                    onBackButtonPress={() => Navigation.goBack(ROUTES.getReportDetailsRoute(report.reportID))}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report.reportID))}
                 />
                 <ScrollView style={[styles.flex1]}>
                     {report.notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN && (
@@ -87,7 +87,7 @@ function ReportSettingsPage(props) {
                             shouldShowRightIcon
                             title={notificationPreference}
                             description={translate('notificationPreferencesPage.label')}
-                            onPress={() => Navigation.navigate(ROUTES.getReportSettingsNotificationPreferencesRoute(report.reportID))}
+                            onPress={() => Navigation.navigate(ROUTES.REPORT_SETTINGS_NOTIFICATION_PREFERENCES.getRoute(report.reportID))}
                         />
                     )}
                     {shouldShowRoomName && (
@@ -117,7 +117,7 @@ function ReportSettingsPage(props) {
                                     shouldShowRightIcon
                                     title={report.reportName}
                                     description={translate('newRoomPage.roomName')}
-                                    onPress={() => Navigation.navigate(ROUTES.getReportSettingsRoomNameRoute(report.reportID))}
+                                    onPress={() => Navigation.navigate(ROUTES.REPORT_SETTINGS_ROOM_NAME.getRoute(report.reportID))}
                                 />
                             )}
                         </OfflineWithFeedback>
@@ -127,7 +127,7 @@ function ReportSettingsPage(props) {
                             shouldShowRightIcon
                             title={writeCapabilityText}
                             description={translate('writeCapabilityPage.label')}
-                            onPress={() => Navigation.navigate(ROUTES.getReportSettingsWriteCapabilityRoute(report.reportID))}
+                            onPress={() => Navigation.navigate(ROUTES.REPORT_SETTINGS_WRITE_CAPABILITY.getRoute(report.reportID))}
                         />
                     ) : (
                         <View style={[styles.ph5, styles.pv3]}>
@@ -184,7 +184,7 @@ function ReportSettingsPage(props) {
                         <MenuItem
                             title={translate('welcomeMessagePage.welcomeMessage')}
                             icon={Expensicons.ChatBubble}
-                            onPress={() => Navigation.navigate(ROUTES.getReportWelcomeMessageRoute(report.reportID))}
+                            onPress={() => Navigation.navigate(ROUTES.REPORT_WELCOME_MESSAGE.getRoute(report.reportID))}
                             shouldShowRightIcon
                         />
                     )}
diff --git a/src/pages/settings/Report/RoomNamePage.js b/src/pages/settings/Report/RoomNamePage.js
index ee15a1649261..985d83e7fd95 100644
--- a/src/pages/settings/Report/RoomNamePage.js
+++ b/src/pages/settings/Report/RoomNamePage.js
@@ -2,6 +2,7 @@ import React, {useCallback, useRef} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
 import {View} from 'react-native';
+import {useIsFocused} from '@react-navigation/native';
 import CONST from '../../../CONST';
 import ScreenWrapper from '../../../components/ScreenWrapper';
 import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
@@ -48,6 +49,7 @@ function RoomNamePage(props) {
     const translate = props.translate;
 
     const roomNameInputRef = useRef(null);
+    const isFocused = useIsFocused();
 
     const validate = useCallback(
         (values) => {
@@ -81,11 +83,12 @@ function RoomNamePage(props) {
         <ScreenWrapper
             onEntryTransitionEnd={() => roomNameInputRef.current && roomNameInputRef.current.focus()}
             includeSafeAreaPaddingBottom={false}
+            testID={RoomNamePage.displayName}
         >
             <FullPageNotFoundView shouldShow={ReportUtils.shouldDisableRename(report, policy)}>
                 <HeaderWithBackButton
                     title={translate('newRoomPage.roomName')}
-                    onBackButtonPress={() => Navigation.goBack(ROUTES.getReportSettingsRoute(report.reportID))}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(report.reportID))}
                 />
                 <Form
                     style={[styles.flexGrow1, styles.ph5]}
@@ -100,6 +103,7 @@ function RoomNamePage(props) {
                             ref={(ref) => (roomNameInputRef.current = ref)}
                             inputID="roomName"
                             defaultValue={report.reportName}
+                            isFocused={isFocused}
                         />
                     </View>
                 </Form>
diff --git a/src/pages/settings/Report/WriteCapabilityPage.js b/src/pages/settings/Report/WriteCapabilityPage.js
index 59ad90a2cd1f..9c4814902117 100644
--- a/src/pages/settings/Report/WriteCapabilityPage.js
+++ b/src/pages/settings/Report/WriteCapabilityPage.js
@@ -51,12 +51,15 @@ function WriteCapabilityPage(props) {
     const isAbleToEdit = !ReportUtils.isAdminRoom(props.report) && PolicyUtils.isPolicyAdmin(props.policy) && !ReportUtils.isArchivedRoom(props.report);
 
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={WriteCapabilityPage.displayName}
+        >
             <FullPageNotFoundView shouldShow={!isAbleToEdit}>
                 <HeaderWithBackButton
                     title={props.translate('writeCapabilityPage.label')}
                     shouldShowBackButton
-                    onBackButtonPress={() => Navigation.goBack(ROUTES.getReportSettingsRoute(props.report.reportID))}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(props.report.reportID))}
                 />
                 <OptionsList
                     sections={[{data: writeCapabilityOptions}]}
diff --git a/src/pages/settings/Security/CloseAccountPage.js b/src/pages/settings/Security/CloseAccountPage.js
index b2370156228a..fb2ae3cfa3d0 100644
--- a/src/pages/settings/Security/CloseAccountPage.js
+++ b/src/pages/settings/Security/CloseAccountPage.js
@@ -76,7 +76,10 @@ function CloseAccountPage(props) {
     const userEmailOrPhone = props.formatPhoneNumber(props.session.email);
 
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={CloseAccountPage.displayName}
+        >
             <HeaderWithBackButton
                 title={props.translate('closeAccountPage.closeAccount')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_SECURITY)}
@@ -133,6 +136,7 @@ function CloseAccountPage(props) {
 
 CloseAccountPage.propTypes = propTypes;
 CloseAccountPage.defaultProps = defaultProps;
+CloseAccountPage.displayName = 'CloseAccountPage';
 
 export default compose(
     withLocalize,
diff --git a/src/pages/settings/Security/SecuritySettingsPage.js b/src/pages/settings/Security/SecuritySettingsPage.js
index 90b006669527..293e488ede7a 100644
--- a/src/pages/settings/Security/SecuritySettingsPage.js
+++ b/src/pages/settings/Security/SecuritySettingsPage.js
@@ -3,16 +3,18 @@ import React from 'react';
 import {View, ScrollView} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
-import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
 import Navigation from '../../../libs/Navigation/Navigation';
 import ROUTES from '../../../ROUTES';
+import SCREENS from '../../../SCREENS';
 import styles from '../../../styles/styles';
 import * as Expensicons from '../../../components/Icon/Expensicons';
-import ScreenWrapper from '../../../components/ScreenWrapper';
+import themeColors from '../../../styles/themes/default';
 import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
 import MenuItem from '../../../components/MenuItem';
 import compose from '../../../libs/compose';
 import ONYXKEYS from '../../../ONYXKEYS';
+import IllustratedHeaderPageLayout from '../../../components/IllustratedHeaderPageLayout';
+import * as LottieAnimations from '../../../components/LottieAnimations';
 
 const propTypes = {
     ...withLocalizePropTypes,
@@ -47,11 +49,14 @@ function SecuritySettingsPage(props) {
     ];
 
     return (
-        <ScreenWrapper>
-            <HeaderWithBackButton
-                title={props.translate('initialSettingsPage.security')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS)}
-            />
+        <IllustratedHeaderPageLayout
+            title={props.translate('initialSettingsPage.security')}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS)}
+            shouldShowBackButton
+            shouldShowCloseButton
+            illustration={LottieAnimations.Safe}
+            backgroundColor={themeColors.PAGE_BACKGROUND_COLORS[SCREENS.SETTINGS.SECURITY]}
+        >
             <ScrollView contentContainerStyle={[styles.flexGrow1, styles.flexColumn, styles.justifyContentBetween]}>
                 <View style={[styles.flex1]}>
                     {_.map(menuItems, (item) => (
@@ -66,7 +71,7 @@ function SecuritySettingsPage(props) {
                     ))}
                 </View>
             </ScrollView>
-        </ScreenWrapper>
+        </IllustratedHeaderPageLayout>
     );
 }
 
diff --git a/src/pages/settings/Security/TwoFactorAuth/StepWrapper/StepWrapper.js b/src/pages/settings/Security/TwoFactorAuth/StepWrapper/StepWrapper.js
index 16f9489d87b0..64aa64d07ee5 100644
--- a/src/pages/settings/Security/TwoFactorAuth/StepWrapper/StepWrapper.js
+++ b/src/pages/settings/Security/TwoFactorAuth/StepWrapper/StepWrapper.js
@@ -24,6 +24,7 @@ function StepWrapper({
         <ScreenWrapper
             shouldShowOfflineIndicator={false}
             shouldEnableKeyboardAvoidingView={shouldEnableKeyboardAvoidingView}
+            testID={StepWrapper.displayName}
         >
             <AnimatedStep
                 style={[styles.flex1]}
@@ -43,5 +44,6 @@ function StepWrapper({
 }
 
 StepWrapper.propTypes = StepWrapperPropTypes;
+StepWrapper.displayName = 'StepWrapper';
 
 export default StepWrapper;
diff --git a/src/pages/settings/Security/TwoFactorAuth/Steps/CodesStep.js b/src/pages/settings/Security/TwoFactorAuth/Steps/CodesStep.js
index 52d7a9806f69..86a478a5571d 100644
--- a/src/pages/settings/Security/TwoFactorAuth/Steps/CodesStep.js
+++ b/src/pages/settings/Security/TwoFactorAuth/Steps/CodesStep.js
@@ -1,4 +1,4 @@
-import React, {useEffect} from 'react';
+import React, {useEffect, useState} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import {ActivityIndicator, View} from 'react-native';
 import {ScrollView} from 'react-native-gesture-handler';
@@ -23,10 +23,12 @@ import useWindowDimensions from '../../../../../hooks/useWindowDimensions';
 import StepWrapper from '../StepWrapper/StepWrapper';
 import {defaultAccount, TwoFactorAuthPropTypes} from '../TwoFactorAuthPropTypes';
 import * as TwoFactorAuthActions from '../../../../../libs/actions/TwoFactorAuthActions';
+import FormHelpMessage from '../../../../../components/FormHelpMessage';
 
 function CodesStep({account = defaultAccount}) {
     const {translate} = useLocalize();
     const {isExtraSmallScreenWidth, isSmallScreenWidth} = useWindowDimensions();
+    const [error, setError] = useState('');
 
     const {setStep} = useTwoFactorAuthContext();
 
@@ -47,7 +49,7 @@ function CodesStep({account = defaultAccount}) {
                 total: 3,
             }}
         >
-            <ScrollView>
+            <ScrollView contentContainerStyle={styles.flexGrow1}>
                 <Section
                     title={translate('twoFactorAuth.keepCodesSafe')}
                     icon={Illustrations.ShieldYellow}
@@ -83,6 +85,7 @@ function CodesStep({account = defaultAccount}) {
                                         inline={false}
                                         onPress={() => {
                                             Clipboard.setString(account.recoveryCodes);
+                                            setError('');
                                             TwoFactorAuthActions.setCodesAreCopied();
                                         }}
                                         styles={[styles.button, styles.buttonMedium, styles.twoFactorAuthCodesButton]}
@@ -93,6 +96,7 @@ function CodesStep({account = defaultAccount}) {
                                         icon={Expensicons.Download}
                                         onPress={() => {
                                             localFileDownload('two-factor-auth-codes', account.recoveryCodes);
+                                            setError('');
                                             TwoFactorAuthActions.setCodesAreCopied();
                                         }}
                                         inline={false}
@@ -104,15 +108,27 @@ function CodesStep({account = defaultAccount}) {
                         )}
                     </View>
                 </Section>
+                <FixedFooter style={[styles.mtAuto, styles.pt5]}>
+                    {!_.isEmpty(error) && (
+                        <FormHelpMessage
+                            isError
+                            message={translate(error)}
+                            style={[styles.mb3]}
+                        />
+                    )}
+                    <Button
+                        success
+                        text={translate('common.next')}
+                        onPress={() => {
+                            if (!account.codesAreCopied) {
+                                setError('twoFactorAuth.errorStepCodes');
+                                return;
+                            }
+                            setStep(CONST.TWO_FACTOR_AUTH_STEPS.VERIFY);
+                        }}
+                    />
+                </FixedFooter>
             </ScrollView>
-            <FixedFooter style={[styles.mtAuto, styles.pt2]}>
-                <Button
-                    success
-                    text={translate('common.next')}
-                    onPress={() => setStep(CONST.TWO_FACTOR_AUTH_STEPS.VERIFY)}
-                    isDisabled={!account.codesAreCopied}
-                />
-            </FixedFooter>
         </StepWrapper>
     );
 }
diff --git a/src/pages/settings/Security/TwoFactorAuth/Steps/VerifyStep.js b/src/pages/settings/Security/TwoFactorAuth/Steps/VerifyStep.js
index 8c3d9689cfcd..eb08a8da316b 100644
--- a/src/pages/settings/Security/TwoFactorAuth/Steps/VerifyStep.js
+++ b/src/pages/settings/Security/TwoFactorAuth/Steps/VerifyStep.js
@@ -76,8 +76,8 @@ function VerifyStep({account = defaultAccount}) {
             onEntryTransitionEnd={() => formRef.current && formRef.current.focus()}
         >
             <ScrollView
-                style={styles.mb5}
                 keyboardShouldPersistTaps="handled"
+                contentContainerStyle={styles.flexGrow1}
             >
                 <View style={[styles.ph5, styles.mt3]}>
                     <Text>
@@ -110,20 +110,20 @@ function VerifyStep({account = defaultAccount}) {
                 <View style={[styles.mt3, styles.mh5]}>
                     <TwoFactorAuthForm innerRef={formRef} />
                 </View>
+                <FixedFooter style={[styles.mtAuto, styles.pt5]}>
+                    <Button
+                        success
+                        text={translate('common.next')}
+                        isLoading={account.isLoading}
+                        onPress={() => {
+                            if (!formRef.current) {
+                                return;
+                            }
+                            formRef.current.validateAndSubmitForm();
+                        }}
+                    />
+                </FixedFooter>
             </ScrollView>
-            <FixedFooter style={[styles.mtAuto, styles.pt2]}>
-                <Button
-                    success
-                    text={translate('common.next')}
-                    isLoading={account.isLoading}
-                    onPress={() => {
-                        if (!formRef.current) {
-                            return;
-                        }
-                        formRef.current.validateAndSubmitForm();
-                    }}
-                />
-            </FixedFooter>
         </StepWrapper>
     );
 }
diff --git a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthSteps.js b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthSteps.js
index e0094267742b..58852c1dba02 100644
--- a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthSteps.js
+++ b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthSteps.js
@@ -24,14 +24,13 @@ function TwoFactorAuthSteps({account = defaultAccount}) {
             setCurrentStep(account.twoFactorAuthStep);
             return;
         }
+
         if (account.requiresTwoFactorAuth) {
             setCurrentStep(CONST.TWO_FACTOR_AUTH_STEPS.ENABLED);
         } else {
             setCurrentStep(CONST.TWO_FACTOR_AUTH_STEPS.CODES);
         }
-        // we don't want to trigger the hook every time the step changes, only when the requiresTwoFactorAuth changes
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [account.requiresTwoFactorAuth]);
+    }, [account.requiresTwoFactorAuth, account.twoFactorAuthStep]);
 
     const handleSetStep = useCallback(
         (step, animationDirection = CONST.ANIMATION_DIRECTION.IN) => {
diff --git a/src/pages/settings/Wallet/AddDebitCardPage.js b/src/pages/settings/Wallet/AddDebitCardPage.js
index 606c2f0809b8..e75c3b2c517e 100644
--- a/src/pages/settings/Wallet/AddDebitCardPage.js
+++ b/src/pages/settings/Wallet/AddDebitCardPage.js
@@ -108,6 +108,7 @@ function DebitCardPage(props) {
         <ScreenWrapper
             onEntryTransitionEnd={() => nameOnCardRef.current && nameOnCardRef.current.focus()}
             includeSafeAreaPaddingBottom={false}
+            testID={DebitCardPage.displayName}
         >
             <HeaderWithBackButton
                 title={translate('addDebitCardPage.addADebitCard')}
@@ -201,6 +202,7 @@ function DebitCardPage(props) {
 
 DebitCardPage.propTypes = propTypes;
 DebitCardPage.defaultProps = defaultProps;
+DebitCardPage.displayName = 'DebitCardPage';
 
 export default withOnyx({
     formData: {
diff --git a/src/pages/settings/Wallet/AddPayPalMePage.js b/src/pages/settings/Wallet/AddPayPalMePage.js
deleted file mode 100644
index 38eae4d46bbc..000000000000
--- a/src/pages/settings/Wallet/AddPayPalMePage.js
+++ /dev/null
@@ -1,142 +0,0 @@
-import React, {useRef, useCallback} from 'react';
-import {View} from 'react-native';
-import _ from 'underscore';
-import {withOnyx} from 'react-native-onyx';
-import lodashGet from 'lodash/get';
-import CONST from '../../../CONST';
-import ROUTES from '../../../ROUTES';
-import compose from '../../../libs/compose';
-import ONYXKEYS from '../../../ONYXKEYS';
-import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
-import TextLink from '../../../components/TextLink';
-import Text from '../../../components/Text';
-import ScreenWrapper from '../../../components/ScreenWrapper';
-import Navigation from '../../../libs/Navigation/Navigation';
-import styles from '../../../styles/styles';
-import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
-import Form from '../../../components/Form';
-import Growl from '../../../libs/Growl';
-import TextInput from '../../../components/TextInput';
-import * as ValidationUtils from '../../../libs/ValidationUtils';
-import * as User from '../../../libs/actions/User';
-import Icon from '../../../components/Icon';
-import * as Expensicons from '../../../components/Icon/Expensicons';
-import variables from '../../../styles/variables';
-import PressableWithoutFeedback from '../../../components/Pressable/PressableWithoutFeedback';
-import paypalMeDataPropTypes from '../../../components/paypalMeDataPropTypes';
-import * as Link from '../../../libs/actions/Link';
-
-const propTypes = {
-    /** Account details for PayPal.Me */
-    payPalMeData: paypalMeDataPropTypes,
-
-    ...withLocalizePropTypes,
-};
-
-const defaultProps = {
-    payPalMeData: {},
-};
-
-const validate = (values) => {
-    const requiredFields = ['payPalMeUsername'];
-    const errors = ValidationUtils.getFieldRequiredErrors(values, requiredFields);
-
-    if (values.payPalMeUsername && !ValidationUtils.isValidPaypalUsername(values.payPalMeUsername)) {
-        errors.payPalMeUsername = 'addPayPalMePage.formatError';
-    }
-
-    return errors;
-};
-
-function AddPayPalMePage(props) {
-    const payPalMeInput = useRef(null);
-
-    const hasPaypalAccount = !_.isEmpty(props.payPalMeData);
-
-    const growlMessageOnSave = props.translate(hasPaypalAccount ? 'addPayPalMePage.growlMessageOnUpdate' : 'addPayPalMePage.growlMessageOnSave');
-
-    /**
-     * Sets the payPalMe username and error data for the current user
-     */
-    const setPayPalMeData = useCallback(
-        (values) => {
-            User.addPaypalMeAddress(values.payPalMeUsername);
-            Growl.show(growlMessageOnSave, CONST.GROWL.SUCCESS, 3000);
-            Navigation.goBack(ROUTES.SETTINGS_WALLET);
-        },
-        [growlMessageOnSave],
-    );
-
-    return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            onEntryTransitionEnd={() => payPalMeInput.current && payPalMeInput.current.focus()}
-        >
-            <HeaderWithBackButton
-                title={props.translate('common.payPalMe')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET)}
-            />
-            <Form
-                style={[styles.flex1, styles.p5]}
-                formID={ONYXKEYS.FORMS.PAYPAL_FORM}
-                validate={validate}
-                onSubmit={setPayPalMeData}
-                submitButtonText={props.translate(hasPaypalAccount ? 'addPayPalMePage.updatePaypalAccount' : 'addPayPalMePage.addPayPalAccount')}
-                enabledWhenOffline
-            >
-                <Text style={[styles.mb4]}>{props.translate('addPayPalMePage.enterYourUsernameToGetPaidViaPayPal')}</Text>
-                <TextInput
-                    inputID="payPalMeUsername"
-                    ref={(ref) => (payPalMeInput.current = ref)}
-                    label={props.translate('addPayPalMePage.payPalMe')}
-                    accessibilityLabel={props.translate('addPayPalMePage.payPalMe')}
-                    accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                    autoCompleteType="off"
-                    autoCorrect={false}
-                    placeholder={props.translate('addPayPalMePage.yourPayPalUsername')}
-                    returnKeyType="done"
-                    defaultValue={lodashGet(props.payPalMeData, 'accountData.username', '')}
-                />
-                <View style={[styles.mt3, styles.flexRow, styles.justifyContentBetween, styles.alignSelfStart]}>
-                    <Text style={[styles.textMicro, styles.flexRow]}>{props.translate('addPayPalMePage.checkListOf')}</Text>
-                    <PressableWithoutFeedback
-                        shouldUseAutoHitSlop={false}
-                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.LINK}
-                        accessibilityLabel={props.translate('addPayPalMePage.supportedCurrencies')}
-                        onPress={() => Link.openExternalLink('https://developer.paypal.com/docs/reports/reference/paypal-supported-currencies')}
-                    >
-                        <View style={[styles.flexRow, styles.cursorPointer]}>
-                            <TextLink
-                                // eslint-disable-next-line max-len
-                                href="https://developer.paypal.com/docs/reports/reference/paypal-supported-currencies"
-                                style={[styles.textMicro]}
-                            >
-                                {props.translate('addPayPalMePage.supportedCurrencies')}
-                            </TextLink>
-                            <View style={[styles.ml1]}>
-                                <Icon
-                                    src={Expensicons.NewWindow}
-                                    height={variables.iconSizeExtraSmall}
-                                    width={variables.iconSizeExtraSmall}
-                                />
-                            </View>
-                        </View>
-                    </PressableWithoutFeedback>
-                </View>
-            </Form>
-        </ScreenWrapper>
-    );
-}
-
-AddPayPalMePage.propTypes = propTypes;
-AddPayPalMePage.defaultProps = defaultProps;
-AddPayPalMePage.displayName = 'AddPayPalMePage';
-
-export default compose(
-    withLocalize,
-    withOnyx({
-        payPalMeData: {
-            key: ONYXKEYS.PAYPAL,
-        },
-    }),
-)(AddPayPalMePage);
diff --git a/src/pages/settings/Wallet/ChooseTransferAccountPage.js b/src/pages/settings/Wallet/ChooseTransferAccountPage.js
index fefc1288f688..78a9e92326bc 100644
--- a/src/pages/settings/Wallet/ChooseTransferAccountPage.js
+++ b/src/pages/settings/Wallet/ChooseTransferAccountPage.js
@@ -52,7 +52,7 @@ function ChooseTransferAccountPage(props) {
     };
 
     return (
-        <ScreenWrapper>
+        <ScreenWrapper testID={ChooseTransferAccountPage.displayName}>
             <HeaderWithBackButton
                 title={props.translate('chooseTransferAccountPage.chooseAccount')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET_TRANSFER_BALANCE)}
diff --git a/src/pages/settings/Wallet/ExpensifyCardPage.js b/src/pages/settings/Wallet/ExpensifyCardPage.js
new file mode 100644
index 000000000000..bc49301e8d80
--- /dev/null
+++ b/src/pages/settings/Wallet/ExpensifyCardPage.js
@@ -0,0 +1,107 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import {ScrollView, View} from 'react-native';
+import {withOnyx} from 'react-native-onyx';
+import _ from 'underscore';
+import ONYXKEYS from '../../../ONYXKEYS';
+import ROUTES from '../../../ROUTES';
+import NotFoundPage from '../../ErrorPage/NotFoundPage';
+import CardPreview from '../../../components/CardPreview';
+import HeaderWithBackButton from '../../../components/HeaderWithBackButton';
+import MenuItemWithTopDescription from '../../../components/MenuItemWithTopDescription';
+import ScreenWrapper from '../../../components/ScreenWrapper';
+import assignedCardPropTypes from './assignedCardPropTypes';
+import useLocalize from '../../../hooks/useLocalize';
+import * as CurrencyUtils from '../../../libs/CurrencyUtils';
+import Navigation from '../../../libs/Navigation/Navigation';
+import styles from '../../../styles/styles';
+import * as CardUtils from '../../../libs/CardUtils';
+
+const propTypes = {
+    /* Onyx Props */
+    cardList: PropTypes.objectOf(assignedCardPropTypes),
+
+    /** Navigation route context info provided by react navigation */
+    route: PropTypes.shape({
+        params: PropTypes.shape({
+            /** domain passed via route /settings/wallet/card/:domain */
+            domain: PropTypes.string,
+        }),
+    }).isRequired,
+};
+
+const defaultProps = {
+    cardList: {},
+};
+
+function ExpensifyCardPage({
+    cardList,
+    route: {
+        params: {domain},
+    },
+}) {
+    const {translate} = useLocalize();
+    const domainCards = CardUtils.getDomainCards(cardList)[domain];
+    const virtualCard = _.find(domainCards, (card) => card.isVirtual) || {};
+    const physicalCard = _.find(domainCards, (card) => !card.isVirtual) || {};
+
+    if (_.isEmpty(virtualCard) && _.isEmpty(physicalCard)) {
+        return <NotFoundPage />;
+    }
+
+    const formattedAvailableSpendAmount = CurrencyUtils.convertToDisplayString(physicalCard.availableSpend || virtualCard.availableSpend || 0);
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={ExpensifyCardPage.displayName}
+        >
+            {({safeAreaPaddingBottomStyle}) => (
+                <>
+                    <HeaderWithBackButton
+                        title={translate('cardPage.expensifyCard')}
+                        onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET)}
+                    />
+                    <ScrollView contentContainerStyle={safeAreaPaddingBottomStyle}>
+                        <View style={[styles.flex1, styles.mb4, styles.mt4]}>
+                            <CardPreview />
+                        </View>
+
+                        <MenuItemWithTopDescription
+                            description={translate('cardPage.availableSpend')}
+                            title={formattedAvailableSpendAmount}
+                            interactive={false}
+                            titleStyle={styles.newKansasLarge}
+                        />
+                        {!_.isEmpty(physicalCard) && (
+                            <MenuItemWithTopDescription
+                                description={translate('cardPage.virtualCardNumber')}
+                                title={CardUtils.maskCard(virtualCard.lastFourPAN)}
+                                interactive={false}
+                                titleStyle={styles.walletCardNumber}
+                            />
+                        )}
+                        {!_.isEmpty(physicalCard) && (
+                            <MenuItemWithTopDescription
+                                description={translate('cardPage.physicalCardNumber')}
+                                title={CardUtils.maskCard(physicalCard.lastFourPAN)}
+                                interactive={false}
+                                titleStyle={styles.walletCardNumber}
+                            />
+                        )}
+                    </ScrollView>
+                </>
+            )}
+        </ScreenWrapper>
+    );
+}
+
+ExpensifyCardPage.propTypes = propTypes;
+ExpensifyCardPage.defaultProps = defaultProps;
+ExpensifyCardPage.displayName = 'ExpensifyCardPage';
+
+export default withOnyx({
+    cardList: {
+        key: ONYXKEYS.CARD_LIST,
+    },
+})(ExpensifyCardPage);
diff --git a/src/pages/settings/Wallet/PaymentMethodList.js b/src/pages/settings/Wallet/PaymentMethodList.js
index 94bcf9f87078..d757db370b05 100644
--- a/src/pages/settings/Wallet/PaymentMethodList.js
+++ b/src/pages/settings/Wallet/PaymentMethodList.js
@@ -16,7 +16,6 @@ import ONYXKEYS from '../../../ONYXKEYS';
 import CONST from '../../../CONST';
 import * as Expensicons from '../../../components/Icon/Expensicons';
 import bankAccountPropTypes from '../../../components/bankAccountPropTypes';
-import paypalMeDataPropTypes from '../../../components/paypalMeDataPropTypes';
 import cardPropTypes from '../../../components/cardPropTypes';
 import * as PaymentUtils from '../../../libs/PaymentUtils';
 import FormAlertWrapper from '../../../components/FormAlertWrapper';
@@ -28,9 +27,6 @@ const propTypes = {
     /** What to do when a menu item is pressed */
     onPress: PropTypes.func.isRequired,
 
-    /** Account details for PayPal.Me */
-    payPalMeData: paypalMeDataPropTypes,
-
     /** List of bank accounts */
     bankAccountList: PropTypes.objectOf(bankAccountPropTypes),
 
@@ -77,7 +73,6 @@ const propTypes = {
 };
 
 const defaultProps = {
-    payPalMeData: {},
     bankAccountList: {},
     fundList: null,
     userWallet: {
@@ -149,14 +144,13 @@ function isPaymentMethodActive(actionPaymentMethodType, activePaymentMethodID, p
     return paymentMethod.accountType === actionPaymentMethodType && paymentMethod.methodID === activePaymentMethodID;
 }
 function PaymentMethodList(props) {
-    const {actionPaymentMethodType, activePaymentMethodID, bankAccountList, fundList, filterType, network, onPress, payPalMeData, shouldShowSelectedState, selectedMethodID, translate} =
-        props;
+    const {actionPaymentMethodType, activePaymentMethodID, bankAccountList, fundList, filterType, network, onPress, shouldShowSelectedState, selectedMethodID, translate} = props;
 
     const filteredPaymentMethods = useMemo(() => {
         const paymentCardList = fundList || {};
         // Hide any billing cards that are not P2P debit cards for now because you cannot make them your default method, or delete them
         const filteredCardList = _.filter(paymentCardList, (card) => card.accountData.additionalData.isP2PDebitCard);
-        let combinedPaymentMethods = PaymentUtils.formatPaymentMethods(bankAccountList, filteredCardList, payPalMeData);
+        let combinedPaymentMethods = PaymentUtils.formatPaymentMethods(bankAccountList, filteredCardList);
 
         if (!_.isEmpty(filterType)) {
             combinedPaymentMethods = _.filter(combinedPaymentMethods, (paymentMethod) => paymentMethod.accountType === filterType);
@@ -180,7 +174,7 @@ function PaymentMethodList(props) {
         }));
 
         return combinedPaymentMethods;
-    }, [actionPaymentMethodType, activePaymentMethodID, bankAccountList, filterType, network, onPress, payPalMeData, fundList]);
+    }, [actionPaymentMethodType, activePaymentMethodID, bankAccountList, filterType, network, onPress, fundList]);
 
     /**
      * Render placeholder when there are no payments methods
@@ -274,9 +268,6 @@ export default compose(
         isLoadingPaymentMethods: {
             key: ONYXKEYS.IS_LOADING_PAYMENT_METHODS,
         },
-        payPalMeData: {
-            key: ONYXKEYS.PAYPAL,
-        },
         userWallet: {
             key: ONYXKEYS.USER_WALLET,
         },
diff --git a/src/pages/settings/Wallet/TransferBalancePage.js b/src/pages/settings/Wallet/TransferBalancePage.js
index b52695c2e922..f33c92bea02b 100644
--- a/src/pages/settings/Wallet/TransferBalancePage.js
+++ b/src/pages/settings/Wallet/TransferBalancePage.js
@@ -137,7 +137,7 @@ function TransferBalancePage(props) {
 
     if (props.walletTransfer.shouldShowSuccess && !props.walletTransfer.loading) {
         return (
-            <ScreenWrapper>
+            <ScreenWrapper testID={TransferBalancePage.displayName}>
                 <HeaderWithBackButton
                     title={props.translate('common.transferBalance')}
                     onBackButtonPress={PaymentMethods.dismissSuccessfulTransferBalancePage}
@@ -170,7 +170,7 @@ function TransferBalancePage(props) {
     const shouldShowTransferView = PaymentUtils.hasExpensifyPaymentMethod(paymentCardList, props.bankAccountList) && props.userWallet.tierName === CONST.WALLET.TIER_NAME.GOLD;
 
     return (
-        <ScreenWrapper>
+        <ScreenWrapper testID={TransferBalancePage.displayName}>
             <FullPageNotFoundView
                 shouldShow={!shouldShowTransferView}
                 titleKey="notFound.pageNotFound"
diff --git a/src/pages/settings/Wallet/WalletPage/BaseWalletPage.js b/src/pages/settings/Wallet/WalletPage/BaseWalletPage.js
index 1393892b6ef0..74f0137fa26d 100644
--- a/src/pages/settings/Wallet/WalletPage/BaseWalletPage.js
+++ b/src/pages/settings/Wallet/WalletPage/BaseWalletPage.js
@@ -74,7 +74,9 @@ function BaseWalletPage(props) {
      * @param {Object} position
      */
     const setMenuPosition = useCallback(() => {
-        if (!paymentMethodButtonRef.current) return;
+        if (!paymentMethodButtonRef.current) {
+            return;
+        }
 
         const position = getClickedTargetLocation(paymentMethodButtonRef.current);
 
@@ -89,9 +91,6 @@ function BaseWalletPage(props) {
     }, [windowWidth]);
 
     const getSelectedPaymentMethodID = useCallback(() => {
-        if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.PAYPAL) {
-            return CONST.PAYMENT_METHODS.PAYPAL;
-        }
         if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.BANK_ACCOUNT) {
             return paymentMethod.selectedPaymentMethod.bankAccountID;
         }
@@ -138,14 +137,7 @@ function BaseWalletPage(props) {
         // The delete/default menu
         if (accountType) {
             let formattedSelectedPaymentMethod;
-            if (accountType === CONST.PAYMENT_METHODS.PAYPAL) {
-                formattedSelectedPaymentMethod = {
-                    title: 'PayPal.me',
-                    icon: account.icon,
-                    description: PaymentUtils.getPaymentMethodDescription(accountType, account),
-                    type: CONST.PAYMENT_METHODS.PAYPAL,
-                };
-            } else if (accountType === CONST.PAYMENT_METHODS.BANK_ACCOUNT) {
+            if (accountType === CONST.PAYMENT_METHODS.BANK_ACCOUNT) {
                 formattedSelectedPaymentMethod = {
                     title: account.addressName,
                     icon: account.icon,
@@ -190,11 +182,6 @@ function BaseWalletPage(props) {
     const addPaymentMethodTypePressed = (paymentType) => {
         hideAddPaymentMenu();
 
-        if (paymentType === CONST.PAYMENT_METHODS.PAYPAL) {
-            Navigation.navigate(ROUTES.SETTINGS_ADD_PAYPAL_ME);
-            return;
-        }
-
         if (paymentType === CONST.PAYMENT_METHODS.DEBIT_CARD) {
             Navigation.navigate(ROUTES.SETTINGS_ADD_DEBIT_CARD);
             return;
@@ -241,9 +228,7 @@ function BaseWalletPage(props) {
     ]);
 
     const deletePaymentMethod = useCallback(() => {
-        if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.PAYPAL) {
-            PaymentMethods.deletePayPalMe();
-        } else if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.BANK_ACCOUNT) {
+        if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.BANK_ACCOUNT) {
             BankAccounts.deletePaymentBankAccount(paymentMethod.selectedPaymentMethod.bankAccountID);
         } else if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.DEBIT_CARD) {
             PaymentMethods.deletePaymentCard(paymentMethod.selectedPaymentMethod.fundID);
@@ -254,11 +239,6 @@ function BaseWalletPage(props) {
         Navigation.navigate(ROUTES.SETTINGS_WALLET_TRANSFER_BALANCE);
     };
 
-    const navigateToAddPaypalRoute = () => {
-        Navigation.navigate(ROUTES.SETTINGS_ADD_PAYPAL_ME);
-        setShouldShowDefaultDeleteMenu(false);
-    };
-
     const listHeaderComponent = useCallback(
         () => (
             <>
@@ -350,8 +330,6 @@ function BaseWalletPage(props) {
             shouldResetPaymentMethodData = true;
         } else if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.DEBIT_CARD && _.isEmpty(props.fundList[paymentMethod.methodID])) {
             shouldResetPaymentMethodData = true;
-        } else if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.PAYPAL && _.isEmpty(props.payPalMeData)) {
-            shouldResetPaymentMethodData = true;
         }
         if (shouldResetPaymentMethodData) {
             // Close corresponding selected payment method modals which are open
@@ -359,20 +337,18 @@ function BaseWalletPage(props) {
                 hideDefaultDeleteMenu();
             }
         }
-    }, [hideDefaultDeleteMenu, paymentMethod.methodID, paymentMethod.selectedPaymentMethodType, props.bankAccountList, props.fundList, props.payPalMeData, shouldShowDefaultDeleteMenu]);
+    }, [hideDefaultDeleteMenu, paymentMethod.methodID, paymentMethod.selectedPaymentMethodType, props.bankAccountList, props.fundList, shouldShowDefaultDeleteMenu]);
 
-    const isPayPalMeSelected = paymentMethod.formattedSelectedPaymentMethod.type === CONST.PAYMENT_METHODS.PAYPAL;
     const shouldShowMakeDefaultButton =
         !paymentMethod.isSelectedPaymentMethodDefault &&
         Permissions.canUseWallet(props.betas) &&
-        !isPayPalMeSelected &&
         !(paymentMethod.formattedSelectedPaymentMethod.type === CONST.PAYMENT_METHODS.BANK_ACCOUNT && paymentMethod.selectedPaymentMethod.type === CONST.BANK_ACCOUNT.TYPE.BUSINESS);
 
     // Determines whether or not the modal popup is mounted from the bottom of the screen instead of the side mount on Web or Desktop screens
     const isPopoverBottomMount = anchorPosition.anchorPositionTop === 0 || isSmallScreenWidth;
 
     return (
-        <ScreenWrapper>
+        <ScreenWrapper testID={BaseWalletPage.displayName}>
             <HeaderWithBackButton
                 title={translate('common.wallet')}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS)}
@@ -438,14 +414,6 @@ function BaseWalletPage(props) {
                                 text={translate('walletPage.setDefaultConfirmation')}
                             />
                         )}
-                        {isPayPalMeSelected && (
-                            <Button
-                                onPress={navigateToAddPaypalRoute}
-                                style={[styles.mb4]}
-                                text={translate('common.edit')}
-                                shouldUseDefaultHover
-                            />
-                        )}
                         <Button
                             onPress={() => {
                                 setShowConfirmDeleteContent(true);
@@ -482,7 +450,7 @@ function BaseWalletPage(props) {
 
 BaseWalletPage.propTypes = propTypes;
 BaseWalletPage.defaultProps = defaultProps;
-BaseWalletPage.displayName = BaseWalletPage;
+BaseWalletPage.displayName = 'BaseWalletPage';
 
 export default compose(
     withNetwork(),
@@ -505,9 +473,6 @@ export default compose(
         walletTerms: {
             key: ONYXKEYS.WALLET_TERMS,
         },
-        payPalMeData: {
-            key: ONYXKEYS.PAYPAL,
-        },
         isLoadingPaymentMethods: {
             key: ONYXKEYS.IS_LOADING_PAYMENT_METHODS,
         },
diff --git a/src/pages/settings/Wallet/WalletPage/walletPagePropTypes.js b/src/pages/settings/Wallet/WalletPage/walletPagePropTypes.js
index 5e3f1109f8fb..cdfe19cbf2b4 100644
--- a/src/pages/settings/Wallet/WalletPage/walletPagePropTypes.js
+++ b/src/pages/settings/Wallet/WalletPage/walletPagePropTypes.js
@@ -5,7 +5,6 @@ import bankAccountPropTypes from '../../../../components/bankAccountPropTypes';
 import cardPropTypes from '../../../../components/cardPropTypes';
 import userWalletPropTypes from '../../../EnablePayments/userWalletPropTypes';
 import walletTermsPropTypes from '../../../EnablePayments/walletTermsPropTypes';
-import paypalMeDataPropTypes from '../../../../components/paypalMeDataPropTypes';
 
 const propTypes = {
     /** Wallet balance transfer props */
@@ -34,9 +33,6 @@ const propTypes = {
 
     /** Information about the user accepting the terms for payments */
     walletTerms: walletTermsPropTypes,
-
-    /** Account details for PayPal.Me */
-    payPalMeData: paypalMeDataPropTypes,
 };
 
 const defaultProps = {
@@ -50,7 +46,6 @@ const defaultProps = {
     bankAccountList: {},
     fundList: null,
     walletTerms: {},
-    payPalMeData: {},
 };
 
 export {propTypes, defaultProps};
diff --git a/src/pages/settings/Wallet/assignedCardPropTypes.js b/src/pages/settings/Wallet/assignedCardPropTypes.js
new file mode 100644
index 000000000000..2f0eb1ad4ec9
--- /dev/null
+++ b/src/pages/settings/Wallet/assignedCardPropTypes.js
@@ -0,0 +1,20 @@
+import PropTypes from 'prop-types';
+import CONST from '../../../CONST';
+
+/** Assigned Card props */
+const assignedCardPropTypes = PropTypes.shape({
+    cardID: PropTypes.number,
+    state: PropTypes.number,
+    bank: PropTypes.string,
+    availableSpend: PropTypes.number,
+    domainName: PropTypes.string,
+    lastFourPAN: PropTypes.string,
+    cardName: PropTypes.string,
+    isVirtual: PropTypes.bool,
+    fraud: PropTypes.oneOf([CONST.EXPENSIFY_CARD.FRAUD_TYPES.DOMAIN, CONST.EXPENSIFY_CARD.FRAUD_TYPES.USER, CONST.EXPENSIFY_CARD.FRAUD_TYPES.NONE]),
+    cardholderFirstName: PropTypes.string,
+    cardholderLastName: PropTypes.string,
+    errors: PropTypes.objectOf(PropTypes.string),
+});
+
+export default assignedCardPropTypes;
diff --git a/src/pages/signin/SignInModal.js b/src/pages/signin/SignInModal.js
index 0cd566a47327..f1ce09def084 100644
--- a/src/pages/signin/SignInModal.js
+++ b/src/pages/signin/SignInModal.js
@@ -22,8 +22,9 @@ function SignInModal() {
             style={[styles.highlightBG]}
             includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
+            testID={SignInModal.displayName}
         >
-            <HeaderWithBackButton onBackButtonPress={() => Navigation.goBack()} />
+            <HeaderWithBackButton />
             <SignInPage isInModal />
         </ScreenWrapper>
     );
diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index 75ee4de65a5c..290c528672d2 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -1,4 +1,4 @@
-import React, {useEffect, useRef} from 'react';
+import React, {useEffect, useRef, useState} from 'react';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
 import {withOnyx} from 'react-native-onyx';
@@ -19,7 +19,6 @@ import * as StyleUtils from '../../styles/StyleUtils';
 import useLocalize from '../../hooks/useLocalize';
 import useWindowDimensions from '../../hooks/useWindowDimensions';
 import Log from '../../libs/Log';
-import * as DemoActions from '../../libs/actions/DemoActions';
 
 const propTypes = {
     /** The details about the account that the user is signing in with */
@@ -49,23 +48,12 @@ const propTypes = {
 
     /** Whether or not the sign in page is being rendered in the RHP modal */
     isInModal: PropTypes.bool,
-
-    /** Information about any currently running demos */
-    demoInfo: PropTypes.shape({
-        saastr: PropTypes.shape({
-            isBeginningDemo: PropTypes.bool,
-        }),
-        sbe: PropTypes.shape({
-            isBeginningDemo: PropTypes.bool,
-        }),
-    }),
 };
 
 const defaultProps = {
     account: {},
     credentials: {},
     isInModal: false,
-    demoInfo: {},
 };
 
 /**
@@ -93,12 +81,15 @@ function getRenderOptions({hasLogin, hasValidateCode, hasAccount, isPrimaryLogin
     };
 }
 
-function SignInPage({credentials, account, isInModal, demoInfo}) {
+function SignInPage({credentials, account, isInModal}) {
     const {translate, formatPhoneNumber} = useLocalize();
     const {isSmallScreenWidth} = useWindowDimensions();
     const shouldShowSmallScreen = isSmallScreenWidth || isInModal;
     const safeAreaInsets = useSafeAreaInsets();
     const signInPageLayoutRef = useRef();
+    /** This state is needed to keep track of if user is using recovery code instead of 2fa code,
+     * and we need it here since welcome text(`welcomeText`) also depends on it */
+    const [isUsingRecoveryCode, setIsUsingRecoveryCode] = useState(false);
 
     useEffect(() => Performance.measureTTI(), []);
     useEffect(() => {
@@ -118,8 +109,7 @@ function SignInPage({credentials, account, isInModal, demoInfo}) {
 
     let welcomeHeader = '';
     let welcomeText = '';
-    const {customHeadline, customHeroBody} = DemoActions.getCustomTextForDemo(demoInfo);
-    const headerText = customHeadline || translate('login.hero.header');
+    const headerText = translate('login.hero.header');
     if (shouldShowLoginForm) {
         welcomeHeader = isSmallScreenWidth ? headerText : translate('welcomeText.getStarted');
         welcomeText = isSmallScreenWidth ? translate('welcomeText.getStarted') : '';
@@ -127,7 +117,7 @@ function SignInPage({credentials, account, isInModal, demoInfo}) {
         if (account.requiresTwoFactorAuth) {
             // We will only know this after a user signs in successfully, without their 2FA code
             welcomeHeader = isSmallScreenWidth ? '' : translate('welcomeText.welcomeBack');
-            welcomeText = translate('validateCodeForm.enterAuthenticatorCode');
+            welcomeText = isUsingRecoveryCode ? translate('validateCodeForm.enterRecoveryCode') : translate('validateCodeForm.enterAuthenticatorCode');
         } else {
             const userLogin = Str.removeSMSDomain(credentials.login || '');
 
@@ -167,8 +157,6 @@ function SignInPage({credentials, account, isInModal, demoInfo}) {
                 shouldShowWelcomeText={shouldShowWelcomeText}
                 ref={signInPageLayoutRef}
                 isInModal={isInModal}
-                customHeadline={customHeadline}
-                customHeroBody={customHeroBody}
             >
                 {/* LoginForm must use the isVisible prop. This keeps it mounted, but visually hidden
                     so that password managers can access the values. Conditionally rendering this component will break this feature. */}
@@ -177,7 +165,12 @@ function SignInPage({credentials, account, isInModal, demoInfo}) {
                     blurOnSubmit={account.validated === false}
                     scrollPageToTop={signInPageLayoutRef.current && signInPageLayoutRef.current.scrollPageToTop}
                 />
-                {shouldShowValidateCodeForm && <ValidateCodeForm />}
+                {shouldShowValidateCodeForm && (
+                    <ValidateCodeForm
+                        isUsingRecoveryCode={isUsingRecoveryCode}
+                        setIsUsingRecoveryCode={setIsUsingRecoveryCode}
+                    />
+                )}
                 {shouldShowUnlinkLoginForm && <UnlinkLoginForm />}
                 {shouldShowEmailDeliveryFailurePage && <EmailDeliveryFailurePage />}
             </SignInPageLayout>
@@ -192,5 +185,4 @@ SignInPage.displayName = 'SignInPage';
 export default withOnyx({
     account: {key: ONYXKEYS.ACCOUNT},
     credentials: {key: ONYXKEYS.CREDENTIALS},
-    demoInfo: {key: ONYXKEYS.DEMO_INFO},
 })(SignInPage);
diff --git a/src/pages/signin/SignInPageLayout/BackgroundImage/index.android.js b/src/pages/signin/SignInPageLayout/BackgroundImage/index.android.js
index ee6a2f1aa418..6ce60fc364fd 100644
--- a/src/pages/signin/SignInPageLayout/BackgroundImage/index.android.js
+++ b/src/pages/signin/SignInPageLayout/BackgroundImage/index.android.js
@@ -1,3 +1,19 @@
-import backgroundImage from '../../../../../assets/images/home-background--android.svg';
+import React from 'react';
+import AndroidBackgroundImage from '../../../../../assets/images/home-background--android.svg';
+import styles from '../../../../styles/styles';
+import defaultPropTypes from './propTypes';
 
-export default backgroundImage;
+function BackgroundImage(props) {
+    return (
+        <AndroidBackgroundImage
+            pointerEvents={props.pointerEvents}
+            width={props.width}
+            style={styles.signInBackground}
+        />
+    );
+}
+
+BackgroundImage.displayName = 'BackgroundImage';
+BackgroundImage.propTypes = defaultPropTypes;
+
+export default BackgroundImage;
diff --git a/src/pages/signin/SignInPageLayout/BackgroundImage/index.js b/src/pages/signin/SignInPageLayout/BackgroundImage/index.js
index d8c621509314..710f7b373a81 100644
--- a/src/pages/signin/SignInPageLayout/BackgroundImage/index.js
+++ b/src/pages/signin/SignInPageLayout/BackgroundImage/index.js
@@ -3,15 +3,17 @@ import PropTypes from 'prop-types';
 import MobileBackgroundImage from '../../../../../assets/images/home-background--mobile.svg';
 import DesktopBackgroundImage from '../../../../../assets/images/home-background--desktop.svg';
 import styles from '../../../../styles/styles';
+import defaultPropTypes from './propTypes';
 
 const defaultProps = {
     isSmallScreen: false,
 };
 
 const propTypes = {
+    /** Is the window width narrow, like on a mobile device */
     isSmallScreen: PropTypes.bool,
-    pointerEvents: PropTypes.string.isRequired,
-    width: PropTypes.number.isRequired,
+
+    ...defaultPropTypes,
 };
 function BackgroundImage(props) {
     return props.isSmallScreen ? (
diff --git a/src/pages/signin/SignInPageLayout/BackgroundImage/propTypes.js b/src/pages/signin/SignInPageLayout/BackgroundImage/propTypes.js
new file mode 100644
index 000000000000..533d22ad12c5
--- /dev/null
+++ b/src/pages/signin/SignInPageLayout/BackgroundImage/propTypes.js
@@ -0,0 +1,11 @@
+import PropTypes from 'prop-types';
+
+const propTypes = {
+    /** pointerEvents property to the SVG element */
+    pointerEvents: PropTypes.string.isRequired,
+
+    /** The width of the image. */
+    width: PropTypes.number.isRequired,
+};
+
+export default propTypes;
diff --git a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
index 41f0d222e80b..2b0d27e55abc 100755
--- a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
+++ b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js
@@ -26,6 +26,7 @@ import Terms from '../Terms';
 import PressableWithFeedback from '../../../components/Pressable/PressableWithFeedback';
 import usePrevious from '../../../hooks/usePrevious';
 import * as StyleUtils from '../../../styles/StyleUtils';
+import TextInput from '../../../components/TextInput';
 
 const propTypes = {
     /* Onyx Props */
@@ -51,15 +52,18 @@ const propTypes = {
         authToken: PropTypes.string,
     }),
 
-    /** Indicates which locale the user currently has selected */
-    preferredLocale: PropTypes.string,
-
     /** Information about the network */
     network: networkPropTypes.isRequired,
 
     /** Specifies autocomplete hints for the system, so it can provide autofill */
     autoComplete: PropTypes.oneOf(['sms-otp', 'one-time-code']).isRequired,
 
+    /** Determines if user is switched to using recovery code instead of 2fa code */
+    isUsingRecoveryCode: PropTypes.bool.isRequired,
+
+    /** Function to change `isUsingRecoveryCode` state when user toggles between 2fa code and recovery code */
+    setIsUsingRecoveryCode: PropTypes.func.isRequired,
+
     ...withLocalizePropTypes,
 };
 
@@ -69,7 +73,6 @@ const defaultProps = {
     session: {
         authToken: null,
     },
-    preferredLocale: CONST.LOCALES.DEFAULT,
 };
 
 function BaseValidateCodeForm(props) {
@@ -77,6 +80,7 @@ function BaseValidateCodeForm(props) {
     const [validateCode, setValidateCode] = useState(props.credentials.validateCode || '');
     const [twoFactorAuthCode, setTwoFactorAuthCode] = useState('');
     const [timeRemaining, setTimeRemaining] = useState(30);
+    const [recoveryCode, setRecoveryCode] = useState('');
 
     const prevRequiresTwoFactorAuth = usePrevious(props.account.requiresTwoFactorAuth);
     const prevValidateCode = usePrevious(props.credentials.validateCode);
@@ -87,6 +91,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))) {
@@ -148,7 +153,17 @@ function BaseValidateCodeForm(props) {
      * @param {String} key
      */
     const onTextInput = (text, key) => {
-        const setInput = key === 'validateCode' ? setValidateCode : setTwoFactorAuthCode;
+        let setInput;
+        if (key === 'validateCode') {
+            setInput = setValidateCode;
+        }
+        if (key === 'twoFactorAuthCode') {
+            setInput = setTwoFactorAuthCode;
+        }
+        if (key === 'recoveryCode') {
+            setInput = setRecoveryCode;
+        }
+
         setInput(text);
         setFormError((prevError) => ({...prevError, [key]: ''}));
 
@@ -173,6 +188,8 @@ function BaseValidateCodeForm(props) {
         setTwoFactorAuthCode('');
         setFormError({});
         setValidateCode('');
+        props.setIsUsingRecoveryCode(false);
+        setRecoveryCode('');
     };
 
     /**
@@ -183,11 +200,30 @@ function BaseValidateCodeForm(props) {
         Session.clearSignInData();
     };
 
+    /**
+     * Switches between 2fa and recovery code, clears inputs and errors
+     */
+    const switchBetween2faAndRecoveryCode = () => {
+        props.setIsUsingRecoveryCode(!props.isUsingRecoveryCode);
+
+        setRecoveryCode('');
+        setTwoFactorAuthCode('');
+
+        setFormError((prevError) => ({...prevError, recoveryCode: '', twoFactorAuthCode: ''}));
+
+        if (props.account.errors) {
+            Session.clearAccountMessages();
+        }
+    };
+
     useEffect(() => {
         if (!isLoadingResendValidationForm) {
             return;
         }
         clearLocalSignInData();
+        // `clearLocalSignInData` is not required as a dependency, and adding it
+        // overcomplicates things requiring clearLocalSignInData function to use useCallback
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [isLoadingResendValidationForm]);
 
     /**
@@ -202,13 +238,27 @@ function BaseValidateCodeForm(props) {
             if (input2FARef.current) {
                 input2FARef.current.blur();
             }
-            if (!twoFactorAuthCode.trim()) {
-                setFormError({twoFactorAuthCode: 'validateCodeForm.error.pleaseFillTwoFactorAuth'});
-                return;
-            }
-            if (!ValidationUtils.isValidTwoFactorCode(twoFactorAuthCode)) {
-                setFormError({twoFactorAuthCode: 'passwordForm.error.incorrect2fa'});
-                return;
+            /**
+             * User could be using either recovery code or 2fa code
+             */
+            if (!props.isUsingRecoveryCode) {
+                if (!twoFactorAuthCode.trim()) {
+                    setFormError({twoFactorAuthCode: 'validateCodeForm.error.pleaseFillTwoFactorAuth'});
+                    return;
+                }
+                if (!ValidationUtils.isValidTwoFactorCode(twoFactorAuthCode)) {
+                    setFormError({twoFactorAuthCode: 'passwordForm.error.incorrect2fa'});
+                    return;
+                }
+            } else {
+                if (!recoveryCode.trim()) {
+                    setFormError({recoveryCode: 'recoveryCodeForm.error.pleaseFillRecoveryCode'});
+                    return;
+                }
+                if (!ValidationUtils.isValidRecoveryCode(recoveryCode)) {
+                    setFormError({recoveryCode: 'recoveryCodeForm.error.incorrectRecoveryCode'});
+                    return;
+                }
             }
         } else {
             if (inputValidateCodeRef.current) {
@@ -225,33 +275,61 @@ function BaseValidateCodeForm(props) {
         }
         setFormError({});
 
+        const recoveryCodeOr2faCode = props.isUsingRecoveryCode ? recoveryCode : twoFactorAuthCode;
+
         const accountID = lodashGet(props.credentials, 'accountID');
         if (accountID) {
-            Session.signInWithValidateCode(accountID, validateCode, props.preferredLocale, twoFactorAuthCode);
+            Session.signInWithValidateCode(accountID, validateCode, recoveryCodeOr2faCode);
         } else {
-            Session.signIn(validateCode, twoFactorAuthCode, props.preferredLocale);
+            Session.signIn(validateCode, recoveryCodeOr2faCode);
         }
-    }, [props.account, props.credentials, props.preferredLocale, twoFactorAuthCode, validateCode]);
+    }, [props.account, props.credentials, twoFactorAuthCode, validateCode, props.isUsingRecoveryCode, recoveryCode]);
 
     return (
         <>
             {/* At this point, if we know the account requires 2FA we already successfully authenticated */}
             {props.account.requiresTwoFactorAuth ? (
                 <View style={[styles.mv3]}>
-                    <MagicCodeInput
-                        autoComplete={props.autoComplete}
-                        ref={input2FARef}
-                        label={props.translate('common.twoFactorCode')}
-                        name="twoFactorAuthCode"
-                        value={twoFactorAuthCode}
-                        onChangeText={(text) => onTextInput(text, 'twoFactorAuthCode')}
-                        onFulfill={validateAndSubmitForm}
-                        maxLength={CONST.TFA_CODE_LENGTH}
-                        errorText={formError.twoFactorAuthCode ? props.translate(formError.twoFactorAuthCode) : ''}
-                        hasError={hasError}
-                        autoFocus
-                    />
+                    {props.isUsingRecoveryCode ? (
+                        <TextInput
+                            shouldDelayFocus
+                            accessibilityLabel={props.translate('recoveryCodeForm.recoveryCode')}
+                            value={recoveryCode}
+                            onChangeText={(text) => onTextInput(text, 'recoveryCode')}
+                            maxLength={CONST.RECOVERY_CODE_LENGTH}
+                            label={props.translate('recoveryCodeForm.recoveryCode')}
+                            errorText={formError.recoveryCode ? props.translate(formError.recoveryCode) : ''}
+                            hasError={hasError}
+                            autoFocus
+                        />
+                    ) : (
+                        <MagicCodeInput
+                            shouldDelayFocus
+                            autoComplete={props.autoComplete}
+                            ref={input2FARef}
+                            label={props.translate('common.twoFactorCode')}
+                            name="twoFactorAuthCode"
+                            value={twoFactorAuthCode}
+                            onChangeText={(text) => onTextInput(text, 'twoFactorAuthCode')}
+                            onFulfill={validateAndSubmitForm}
+                            maxLength={CONST.TFA_CODE_LENGTH}
+                            errorText={formError.twoFactorAuthCode ? props.translate(formError.twoFactorAuthCode) : ''}
+                            hasError={hasError}
+                            autoFocus
+                        />
+                    )}
                     {hasError && <FormHelpMessage message={ErrorUtils.getLatestErrorMessage(props.account)} />}
+                    <PressableWithFeedback
+                        style={[styles.mt2]}
+                        onPress={switchBetween2faAndRecoveryCode}
+                        underlayColor={themeColors.componentBG}
+                        hoverDimmingValue={1}
+                        pressDimmingValue={0.2}
+                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
+                        accessibilityLabel={props.isUsingRecoveryCode ? props.translate('recoveryCodeForm.use2fa') : props.translate('recoveryCodeForm.useRecoveryCode')}
+                    >
+                        <Text style={[styles.link]}>{props.isUsingRecoveryCode ? props.translate('recoveryCodeForm.use2fa') : props.translate('recoveryCodeForm.useRecoveryCode')}</Text>
+                    </PressableWithFeedback>
                 </View>
             ) : (
                 <View style={[styles.mv3]}>
@@ -279,13 +357,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>
@@ -322,7 +400,6 @@ export default compose(
     withOnyx({
         account: {key: ONYXKEYS.ACCOUNT},
         credentials: {key: ONYXKEYS.CREDENTIALS},
-        preferredLocale: {key: ONYXKEYS.NVP_PREFERRED_LOCALE},
         session: {key: ONYXKEYS.SESSION},
     }),
     withNetwork(),
diff --git a/src/pages/signin/ValidateCodeForm/index.android.js b/src/pages/signin/ValidateCodeForm/index.android.js
index 7ff81357725d..1e888d24bc60 100644
--- a/src/pages/signin/ValidateCodeForm/index.android.js
+++ b/src/pages/signin/ValidateCodeForm/index.android.js
@@ -1,11 +1,24 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import BaseValidateCodeForm from './BaseValidateCodeForm';
 
 const defaultProps = {};
 
-const propTypes = {};
-function ValidateCodeForm() {
-    return <BaseValidateCodeForm autoComplete="sms-otp" />;
+const propTypes = {
+    /** Determines if user is switched to using recovery code instead of 2fa code */
+    isUsingRecoveryCode: PropTypes.bool.isRequired,
+
+    /** Function to change `isUsingRecoveryCode` state when user toggles between 2fa code and recovery code */
+    setIsUsingRecoveryCode: PropTypes.func.isRequired,
+};
+function ValidateCodeForm(props) {
+    return (
+        <BaseValidateCodeForm
+            autoComplete="sms-otp"
+            /* eslint-disable-next-line react/jsx-props-no-spreading */
+            {...props}
+        />
+    );
 }
 
 ValidateCodeForm.displayName = 'ValidateCodeForm';
diff --git a/src/pages/signin/ValidateCodeForm/index.js b/src/pages/signin/ValidateCodeForm/index.js
index 6b01c7d4dec2..540b6a3e3ed6 100644
--- a/src/pages/signin/ValidateCodeForm/index.js
+++ b/src/pages/signin/ValidateCodeForm/index.js
@@ -1,11 +1,24 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import BaseValidateCodeForm from './BaseValidateCodeForm';
 
 const defaultProps = {};
 
-const propTypes = {};
-function ValidateCodeForm() {
-    return <BaseValidateCodeForm autoComplete="one-time-code" />;
+const propTypes = {
+    /** Determines if user is switched to using recovery code instead of 2fa code */
+    isUsingRecoveryCode: PropTypes.bool.isRequired,
+
+    /** Function to change `isUsingRecoveryCode` state when user toggles between 2fa code and recovery code */
+    setIsUsingRecoveryCode: PropTypes.func.isRequired,
+};
+function ValidateCodeForm(props) {
+    return (
+        <BaseValidateCodeForm
+            autoComplete="one-time-code"
+            /* eslint-disable-next-line react/jsx-props-no-spreading */
+            {...props}
+        />
+    );
 }
 
 ValidateCodeForm.displayName = 'ValidateCodeForm';
diff --git a/src/pages/tasks/NewTaskDescriptionPage.js b/src/pages/tasks/NewTaskDescriptionPage.js
index dacf368a574e..44fd4346538d 100644
--- a/src/pages/tasks/NewTaskDescriptionPage.js
+++ b/src/pages/tasks/NewTaskDescriptionPage.js
@@ -1,6 +1,7 @@
-import React, {useRef} from 'react';
+import React, {useRef, useCallback} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
+import {useFocusEffect} from '@react-navigation/native';
 import PropTypes from 'prop-types';
 import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
 import compose from '../../libs/compose';
@@ -14,7 +15,7 @@ import TextInput from '../../components/TextInput';
 import Permissions from '../../libs/Permissions';
 import ROUTES from '../../ROUTES';
 import * as Task from '../../libs/actions/Task';
-import focusAndUpdateMultilineInputRange from '../../libs/focusAndUpdateMultilineInputRange';
+import updateMultilineInputRange from '../../libs/UpdateMultilineInputRange';
 import CONST from '../../CONST';
 import * as Browser from '../../libs/Browser';
 
@@ -40,9 +41,26 @@ const defaultProps = {
 
 function NewTaskDescriptionPage(props) {
     const inputRef = useRef(null);
-
+    const focusTimeoutRef = useRef(null);
     // On submit, we want to call the assignTask function and wait to validate
     // the response
+
+    useFocusEffect(
+        useCallback(() => {
+            focusTimeoutRef.current = setTimeout(() => {
+                if (inputRef.current) {
+                    inputRef.current.focus();
+                }
+                return () => {
+                    if (!focusTimeoutRef.current) {
+                        return;
+                    }
+                    clearTimeout(focusTimeoutRef.current);
+                };
+            }, CONST.ANIMATED_TRANSITION);
+        }, []),
+    );
+
     const onSubmit = (values) => {
         Task.setDescriptionValue(values.taskDescription);
         Navigation.goBack(ROUTES.NEW_TASK);
@@ -55,36 +73,44 @@ function NewTaskDescriptionPage(props) {
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
-            onEntryTransitionEnd={() => focusAndUpdateMultilineInputRange(inputRef.current)}
             shouldEnableMaxHeight
+            testID={NewTaskDescriptionPage.displayName}
         >
-            <HeaderWithBackButton
-                title={props.translate('task.description')}
-                onCloseButtonPress={() => Task.dismissModalAndClearOutTaskInfo()}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.NEW_TASK)}
-            />
-            <Form
-                formID={ONYXKEYS.FORMS.NEW_TASK_FORM}
-                submitButtonText={props.translate('common.next')}
-                style={[styles.mh5, styles.flexGrow1]}
-                onSubmit={(values) => onSubmit(values)}
-                enabledWhenOffline
-            >
-                <View style={styles.mb5}>
-                    <TextInput
-                        defaultValue={props.task.description}
-                        inputID="taskDescription"
-                        label={props.translate('newTaskPage.descriptionOptional')}
-                        accessibilityLabel={props.translate('newTaskPage.descriptionOptional')}
-                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                        ref={(el) => (inputRef.current = el)}
-                        autoGrowHeight
-                        submitOnEnter={!Browser.isMobile()}
-                        containerStyles={[styles.autoGrowHeightMultilineInput]}
-                        textAlignVertical="top"
-                    />
-                </View>
-            </Form>
+            <>
+                <HeaderWithBackButton
+                    title={props.translate('task.description')}
+                    onCloseButtonPress={() => Task.dismissModalAndClearOutTaskInfo()}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.NEW_TASK)}
+                />
+                <Form
+                    formID={ONYXKEYS.FORMS.NEW_TASK_FORM}
+                    submitButtonText={props.translate('common.next')}
+                    style={[styles.mh5, styles.flexGrow1]}
+                    onSubmit={(values) => onSubmit(values)}
+                    enabledWhenOffline
+                >
+                    <View style={styles.mb5}>
+                        <TextInput
+                            defaultValue={props.task.description}
+                            inputID="taskDescription"
+                            label={props.translate('newTaskPage.descriptionOptional')}
+                            accessibilityLabel={props.translate('newTaskPage.descriptionOptional')}
+                            accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
+                            ref={(el) => {
+                                if (!el) {
+                                    return;
+                                }
+                                inputRef.current = el;
+                                updateMultilineInputRange(inputRef.current);
+                            }}
+                            autoGrowHeight
+                            submitOnEnter={!Browser.isMobile()}
+                            containerStyles={[styles.autoGrowHeightMultilineInput]}
+                            textAlignVertical="top"
+                        />
+                    </View>
+                </Form>
+            </>
         </ScreenWrapper>
     );
 }
diff --git a/src/pages/tasks/NewTaskDetailsPage.js b/src/pages/tasks/NewTaskDetailsPage.js
index be3b76e2b3ad..b7fd3900e1f3 100644
--- a/src/pages/tasks/NewTaskDetailsPage.js
+++ b/src/pages/tasks/NewTaskDetailsPage.js
@@ -77,6 +77,7 @@ function NewTaskDetailsPage(props) {
             onEntryTransitionEnd={() => inputRef.current && inputRef.current.focus()}
             includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
+            testID={NewTaskDetailsPage.displayName}
         >
             <HeaderWithBackButton
                 title={props.translate('newTaskPage.assignTask')}
diff --git a/src/pages/tasks/NewTaskPage.js b/src/pages/tasks/NewTaskPage.js
index f8f076a1630c..790bd6ceeb64 100644
--- a/src/pages/tasks/NewTaskPage.js
+++ b/src/pages/tasks/NewTaskPage.js
@@ -1,5 +1,5 @@
-import React, {useEffect, useMemo} from 'react';
-import {View} from 'react-native';
+import React, {useEffect, useMemo, useState} from 'react';
+import {ScrollView, View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
 import PropTypes from 'prop-types';
@@ -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,8 +126,15 @@ 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);
+        Task.createTaskAndNavigate(
+            parentReport.reportID,
+            props.task.title,
+            props.task.description,
+            props.task.assignee,
+            props.task.assigneeAccountID,
+            props.task.assigneeChatReport,
+            parentReport.policyID,
+        );
     }
 
     if (!Permissions.canUseTasks(props.betas)) {
@@ -135,7 +143,10 @@ function NewTaskPage(props) {
     }
 
     return (
-        <ScreenWrapper shouldEnableKeyboardAvoidingView={false}>
+        <ScreenWrapper
+            shouldEnableKeyboardAvoidingView={false}
+            testID={NewTaskPage.displayName}
+        >
             <FullPageNotFoundView
                 shouldShow={!isAllowedToCreateTask}
                 onBackButtonPress={() => Task.dismissModalAndClearOutTaskInfo()}
@@ -149,49 +160,54 @@ function NewTaskPage(props) {
                         Navigation.goBack(ROUTES.NEW_TASK_DETAILS);
                     }}
                 />
-                <View style={[styles.containerWithSpaceBetween]}>
-                    <View style={styles.mb5}>
-                        <MenuItemWithTopDescription
-                            description={props.translate('task.title')}
-                            title={props.task.title || ''}
-                            onPress={() => Navigation.navigate(ROUTES.NEW_TASK_TITLE)}
-                            shouldShowRightIcon
-                        />
-                        <MenuItemWithTopDescription
-                            description={props.translate('task.description')}
-                            title={props.task.description || ''}
-                            onPress={() => Navigation.navigate(ROUTES.NEW_TASK_DESCRIPTION)}
-                            shouldShowRightIcon
-                            numberOfLinesTitle={2}
-                            titleStyle={styles.flex1}
-                        />
-                        <MenuItem
-                            label={assignee.displayName ? props.translate('task.assignee') : ''}
-                            title={assignee.displayName || ''}
-                            description={assignee.displayName ? LocalePhoneNumber.formatPhoneNumber(assignee.subtitle) : props.translate('task.assignee')}
-                            icon={assignee.icons}
-                            onPress={() => Navigation.navigate(ROUTES.NEW_TASK_ASSIGNEE)}
-                            shouldShowRightIcon
-                        />
-                        <MenuItem
-                            label={shareDestination.displayName ? props.translate('newTaskPage.shareSomewhere') : ''}
-                            title={shareDestination.displayName || ''}
-                            description={shareDestination.displayName ? shareDestination.subtitle : props.translate('newTaskPage.shareSomewhere')}
-                            icon={shareDestination.icons}
-                            onPress={() => Navigation.navigate(ROUTES.NEW_TASK_SHARE_DESTINATION)}
-                            interactive={!props.task.parentReportID}
-                            shouldShowRightIcon={!props.task.parentReportID}
+                <ScrollView contentContainerStyle={styles.flexGrow1}>
+                    <View style={[styles.flex1]}>
+                        <View style={styles.mb5}>
+                            <MenuItemWithTopDescription
+                                description={props.translate('task.title')}
+                                title={title}
+                                onPress={() => Navigation.navigate(ROUTES.NEW_TASK_TITLE)}
+                                shouldShowRightIcon
+                            />
+                            <MenuItemWithTopDescription
+                                description={props.translate('task.description')}
+                                title={description}
+                                onPress={() => Navigation.navigate(ROUTES.NEW_TASK_DESCRIPTION)}
+                                shouldShowRightIcon
+                                shouldParseTitle
+                                numberOfLinesTitle={2}
+                                titleStyle={styles.flex1}
+                            />
+                            <MenuItem
+                                label={assignee.displayName ? props.translate('task.assignee') : ''}
+                                title={assignee.displayName || ''}
+                                description={assignee.displayName ? LocalePhoneNumber.formatPhoneNumber(assignee.subtitle) : props.translate('task.assignee')}
+                                icon={assignee.icons}
+                                onPress={() => Navigation.navigate(ROUTES.NEW_TASK_ASSIGNEE)}
+                                shouldShowRightIcon
+                            />
+                            <MenuItem
+                                label={shareDestination.displayName ? props.translate('newTaskPage.shareSomewhere') : ''}
+                                title={shareDestination.displayName || ''}
+                                description={shareDestination.displayName ? shareDestination.subtitle : props.translate('newTaskPage.shareSomewhere')}
+                                icon={shareDestination.icons}
+                                onPress={() => Navigation.navigate(ROUTES.NEW_TASK_SHARE_DESTINATION)}
+                                interactive={!props.task.parentReportID}
+                                shouldShowRightIcon={!props.task.parentReportID}
+                            />
+                        </View>
+                    </View>
+                    <View style={[styles.flexShrink0]}>
+                        <FormAlertWithSubmitButton
+                            isAlertVisible={!_.isEmpty(errorMessage)}
+                            message={errorMessage}
+                            onSubmit={() => onSubmit()}
+                            enabledWhenOffline
+                            buttonText={props.translate('newTaskPage.confirmTask')}
+                            containerStyles={[styles.mh0, styles.mt5, styles.flex1, styles.ph5]}
                         />
                     </View>
-                    <FormAlertWithSubmitButton
-                        isAlertVisible={!_.isEmpty(errorMessage)}
-                        message={errorMessage}
-                        onSubmit={() => onSubmit()}
-                        enabledWhenOffline
-                        buttonText={props.translate('newTaskPage.confirmTask')}
-                        containerStyles={[styles.mh0, styles.mt5, styles.flex1, styles.ph5]}
-                    />
-                </View>
+                </ScrollView>
             </FullPageNotFoundView>
         </ScreenWrapper>
     );
diff --git a/src/pages/tasks/NewTaskTitlePage.js b/src/pages/tasks/NewTaskTitlePage.js
index 14d7e7d23b9e..62eb1da4872a 100644
--- a/src/pages/tasks/NewTaskTitlePage.js
+++ b/src/pages/tasks/NewTaskTitlePage.js
@@ -77,6 +77,7 @@ function NewTaskTitlePage(props) {
             }}
             includeSafeAreaPaddingBottom={false}
             shouldEnableMaxHeight
+            testID={NewTaskTitlePage.displayName}
         >
             <HeaderWithBackButton
                 title={props.translate('task.title')}
diff --git a/src/pages/tasks/TaskAssigneeSelectorModal.js b/src/pages/tasks/TaskAssigneeSelectorModal.js
index 10cb27196efd..4ec00df0661c 100644
--- a/src/pages/tasks/TaskAssigneeSelectorModal.js
+++ b/src/pages/tasks/TaskAssigneeSelectorModal.js
@@ -1,5 +1,5 @@
 /* eslint-disable es/no-optional-chaining */
-import React, {useState, useEffect, useMemo, useCallback} from 'react';
+import React, {useState, useEffect, useMemo, useCallback, useRef} from 'react';
 import {View} from 'react-native';
 import lodashGet from 'lodash/get';
 import _ from 'underscore';
@@ -17,9 +17,11 @@ import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize
 import compose from '../../libs/compose';
 import personalDetailsPropType from '../personalDetailsPropType';
 import reportPropTypes from '../reportPropTypes';
+import * as ReportUtils from '../../libs/ReportUtils';
 import ROUTES from '../../ROUTES';
-
 import * as Task from '../../libs/actions/Task';
+import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
+import withCurrentUserPersonalDetails from '../../components/withCurrentUserPersonalDetails';
 
 const propTypes = {
     /** Beta features list */
@@ -78,8 +80,10 @@ function TaskAssigneeSelectorModal(props) {
     const [filteredCurrentUserOption, setFilteredCurrentUserOption] = useState(null);
     const [isLoading, setIsLoading] = React.useState(true);
 
+    const optionRef = useRef();
+
     const updateOptions = useCallback(() => {
-        const {recentReports, personalDetails, userToInvite, currentUserOption} = OptionsListUtils.getNewChatOptions(
+        const {recentReports, personalDetails, userToInvite, currentUserOption} = OptionsListUtils.getFilteredOptions(
             props.reports,
             props.personalDetails,
             props.betas,
@@ -92,6 +96,9 @@ function TaskAssigneeSelectorModal(props) {
             {},
             [],
             false,
+            {},
+            [],
+            false,
         );
 
         setHeaderMessage(OptionsListUtils.getHeaderMessage(recentReports?.length + personalDetails?.length !== 0 || currentUserOption, Boolean(userToInvite), searchValue));
@@ -124,6 +131,12 @@ function TaskAssigneeSelectorModal(props) {
         return props.reports[`${ONYXKEYS.COLLECTION.REPORT}${props.route.params.reportID}`];
     }, [props.reports, props.route.params]);
 
+    if (report && !ReportUtils.isTaskReport(report)) {
+        Navigation.isNavigationReady().then(() => {
+            Navigation.dismissModal(report.reportID);
+        });
+    }
+
     const sections = useMemo(() => {
         const sectionsList = [];
         let indexOffset = 0;
@@ -184,14 +197,22 @@ function TaskAssigneeSelectorModal(props) {
             const assigneeChatReport = Task.setAssigneeValue(option.login, option.accountID, props.route.params.reportID, OptionsListUtils.isCurrentUser(option));
 
             // Pass through the selected assignee
-            Task.editTaskAssigneeAndNavigate(props.task.report, props.session.accountID, option.login, option.accountID, assigneeChatReport);
+            Task.editTaskAssigneeAndNavigate(report, props.session.accountID, option.login, option.accountID, assigneeChatReport);
         }
     };
 
+    const isOpen = ReportUtils.isOpenTaskReport(props.task.report);
+    const canModifyTask = Task.canModifyTask(props.task.report, props.currentUserPersonalDetails.accountID);
+    const isTaskNonEditable = report && ReportUtils.isTaskReport(props.task.report) && (!canModifyTask || !isOpen);
+
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            onEntryTransitionEnd={() => optionRef.current && optionRef.current.textInput.focus()}
+            testID={TaskAssigneeSelectorModal.displayName}
+        >
             {({didScreenTransitionEnd, safeAreaPaddingBottomStyle}) => (
-                <>
+                <FullPageNotFoundView shouldShow={isTaskNonEditable}>
                     <HeaderWithBackButton
                         title={props.translate('task.assignee')}
                         onBackButtonPress={() => (lodashGet(props.route.params, 'reportID') ? Navigation.dismissModal() : Navigation.goBack(ROUTES.NEW_TASK))}
@@ -207,9 +228,11 @@ function TaskAssigneeSelectorModal(props) {
                             shouldShowOptions={didScreenTransitionEnd && !isLoading}
                             textInputLabel={props.translate('optionsSelector.nameEmailOrPhoneNumber')}
                             safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
+                            autoFocus={false}
+                            ref={optionRef}
                         />
                     </View>
-                </>
+                </FullPageNotFoundView>
             )}
         </ScreenWrapper>
     );
@@ -221,6 +244,7 @@ TaskAssigneeSelectorModal.defaultProps = defaultProps;
 
 export default compose(
     withLocalize,
+    withCurrentUserPersonalDetails,
     withOnyx({
         reports: {
             key: ONYXKEYS.COLLECTION.REPORT,
diff --git a/src/pages/tasks/TaskDescriptionPage.js b/src/pages/tasks/TaskDescriptionPage.js
index d1679ac104ce..be2cdad03fe6 100644
--- a/src/pages/tasks/TaskDescriptionPage.js
+++ b/src/pages/tasks/TaskDescriptionPage.js
@@ -1,6 +1,7 @@
 import React, {useCallback, useRef} from 'react';
 import PropTypes from 'prop-types';
 import {View} from 'react-native';
+import {useFocusEffect} from '@react-navigation/native';
 import {withOnyx} from 'react-native-onyx';
 import ScreenWrapper from '../../components/ScreenWrapper';
 import HeaderWithBackButton from '../../components/HeaderWithBackButton';
@@ -12,9 +13,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 updateMultilineInputRange from '../../libs/UpdateMultilineInputRange';
 import * as Browser from '../../libs/Browser';
+import Navigation from '../../libs/Navigation/Navigation';
+import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
+import withCurrentUserPersonalDetails from '../../components/withCurrentUserPersonalDetails';
+import withReportOrNotFound from '../home/report/withReportOrNotFound';
 
 const propTypes = {
     /** Current user session */
@@ -46,48 +52,85 @@ function TaskDescriptionPage(props) {
         [props],
     );
 
+    if (!ReportUtils.isTaskReport(props.report)) {
+        Navigation.isNavigationReady().then(() => {
+            Navigation.dismissModal(props.report.reportID);
+        });
+    }
     const inputRef = useRef(null);
+    const focusTimeoutRef = 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);
+
+    useFocusEffect(
+        useCallback(() => {
+            focusTimeoutRef.current = setTimeout(() => {
+                if (inputRef.current) {
+                    inputRef.current.focus();
+                }
+                return () => {
+                    if (!focusTimeoutRef.current) {
+                        return;
+                    }
+                    clearTimeout(focusTimeoutRef.current);
+                };
+            }, CONST.ANIMATED_TRANSITION);
+        }, []),
+    );
 
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
-            onEntryTransitionEnd={() => focusAndUpdateMultilineInputRange(inputRef.current)}
             shouldEnableMaxHeight
+            testID={TaskDescriptionPage.displayName}
         >
-            <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>
+            <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 (!el) {
+                                    return;
+                                }
+                                inputRef.current = el;
+                                updateMultilineInputRange(inputRef.current);
+                            }}
+                            autoGrowHeight
+                            submitOnEnter={!Browser.isMobile()}
+                            containerStyles={[styles.autoGrowHeightMultilineInput]}
+                            textAlignVertical="top"
+                        />
+                    </View>
+                </Form>
+            </FullPageNotFoundView>
         </ScreenWrapper>
     );
 }
 
 TaskDescriptionPage.propTypes = propTypes;
 TaskDescriptionPage.defaultProps = defaultProps;
+TaskDescriptionPage.displayName = 'TaskDescriptionPage';
 
 export default compose(
     withLocalize,
+    withCurrentUserPersonalDetails,
+    withReportOrNotFound,
     withOnyx({
         session: {
             key: ONYXKEYS.SESSION,
diff --git a/src/pages/tasks/TaskShareDestinationSelectorModal.js b/src/pages/tasks/TaskShareDestinationSelectorModal.js
index 15e3f03964e6..2fc8f0eab014 100644
--- a/src/pages/tasks/TaskShareDestinationSelectorModal.js
+++ b/src/pages/tasks/TaskShareDestinationSelectorModal.js
@@ -1,5 +1,5 @@
 /* eslint-disable es/no-optional-chaining */
-import React, {useState, useEffect, useMemo, useCallback} from 'react';
+import React, {useState, useEffect, useMemo, useCallback, useRef} from 'react';
 import _ from 'underscore';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
@@ -46,10 +46,16 @@ function TaskShareDestinationSelectorModal(props) {
     const [headerMessage, setHeaderMessage] = useState('');
     const [filteredRecentReports, setFilteredRecentReports] = useState([]);
 
+    const optionRef = useRef();
+
     const filteredReports = useMemo(() => {
         const reports = {};
         _.keys(props.reports).forEach((reportKey) => {
-            if (ReportUtils.shouldDisableWriteActions(props.reports[reportKey]) || ReportUtils.isExpensifyOnlyParticipantInReport(props.reports[reportKey])) {
+            if (
+                ReportUtils.shouldDisableWriteActions(props.reports[reportKey]) ||
+                ReportUtils.isExpensifyOnlyParticipantInReport(props.reports[reportKey]) ||
+                ReportUtils.isCanceledTaskReport(props.reports[reportKey])
+            ) {
                 return;
             }
             reports[reportKey] = props.reports[reportKey];
@@ -107,7 +113,11 @@ function TaskShareDestinationSelectorModal(props) {
 
     const sections = getSections();
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            onEntryTransitionEnd={() => optionRef.current && optionRef.current.textInput.focus()}
+            testID={TaskShareDestinationSelectorModal.displayName}
+        >
             {({didScreenTransitionEnd, safeAreaPaddingBottomStyle}) => (
                 <>
                     <HeaderWithBackButton
@@ -127,6 +137,8 @@ function TaskShareDestinationSelectorModal(props) {
                             shouldShowOptions={didScreenTransitionEnd}
                             textInputLabel={props.translate('optionsSelector.nameEmailOrPhoneNumber')}
                             safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle}
+                            autoFocus={false}
+                            ref={optionRef}
                         />
                     </View>
                 </>
diff --git a/src/pages/tasks/TaskTitlePage.js b/src/pages/tasks/TaskTitlePage.js
index cf0c269a6133..fca90a5fa904 100644
--- a/src/pages/tasks/TaskTitlePage.js
+++ b/src/pages/tasks/TaskTitlePage.js
@@ -13,7 +13,12 @@ import styles from '../../styles/styles';
 import reportPropTypes from '../reportPropTypes';
 import compose from '../../libs/compose';
 import * as Task from '../../libs/actions/Task';
+import * as ReportUtils from '../../libs/ReportUtils';
 import CONST from '../../CONST';
+import Navigation from '../../libs/Navigation/Navigation';
+import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
+import withCurrentUserPersonalDetails from '../../components/withCurrentUserPersonalDetails';
+import withReportOrNotFound from '../home/report/withReportOrNotFound';
 
 const propTypes = {
     /** The report currently being looked at */
@@ -58,44 +63,69 @@ function TaskTitlePage(props) {
         [props],
     );
 
+    if (!ReportUtils.isTaskReport(props.report)) {
+        Navigation.isNavigationReady().then(() => {
+            Navigation.dismissModal(props.report.reportID);
+        });
+    }
+
     const inputRef = useRef(null);
+    const isOpen = ReportUtils.isOpenTaskReport(props.report);
+    const canModifyTask = Task.canModifyTask(props.report, props.currentUserPersonalDetails.accountID);
+    const isTaskNonEditable = ReportUtils.isTaskReport(props.report) && (!canModifyTask || !isOpen);
 
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
             onEntryTransitionEnd={() => inputRef.current && inputRef.current.focus()}
             shouldEnableMaxHeight
+            testID={TaskTitlePage.displayName}
         >
-            <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>
     );
 }
 
 TaskTitlePage.propTypes = propTypes;
 TaskTitlePage.defaultProps = defaultProps;
+TaskTitlePage.displayName = 'TaskTitlePage';
 
 export default compose(
     withLocalize,
+    withCurrentUserPersonalDetails,
+    withReportOrNotFound,
     withOnyx({
         session: {
             key: ONYXKEYS.SESSION,
diff --git a/src/pages/wallet/WalletStatementPage.js b/src/pages/wallet/WalletStatementPage.js
index cbd9b72e3299..91563a44ddd5 100644
--- a/src/pages/wallet/WalletStatementPage.js
+++ b/src/pages/wallet/WalletStatementPage.js
@@ -94,6 +94,7 @@ function WalletStatementPage(props) {
         <ScreenWrapper
             shouldShowOfflineIndicator={false}
             includeSafeAreaPaddingBottom={false}
+            testID={WalletStatementPage.displayName}
         >
             <HeaderWithBackButton
                 title={Str.recapitalize(title)}
diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js
index 0d6599631b8d..567aef1274e1 100644
--- a/src/pages/workspace/WorkspaceInitialPage.js
+++ b/src/pages/workspace/WorkspaceInitialPage.js
@@ -53,7 +53,7 @@ const defaultProps = {
  * @param {string} policyID
  */
 function openEditor(policyID) {
-    Navigation.navigate(ROUTES.getWorkspaceSettingsRoute(policyID));
+    Navigation.navigate(ROUTES.WORKSPACE_SETTINGS.getRoute(policyID));
 }
 
 /**
@@ -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],
     );
@@ -117,39 +117,39 @@ function WorkspaceInitialPage(props) {
         {
             translationKey: 'workspace.common.settings',
             icon: Expensicons.Gear,
-            action: () => Navigation.navigate(ROUTES.getWorkspaceSettingsRoute(policy.id)),
+            action: () => Navigation.navigate(ROUTES.WORKSPACE_SETTINGS.getRoute(policy.id)),
             brickRoadIndicator: hasGeneralSettingsError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : '',
         },
         {
             translationKey: 'workspace.common.card',
             icon: Expensicons.ExpensifyCard,
-            action: () => Navigation.navigate(ROUTES.getWorkspaceCardRoute(policy.id)),
+            action: () => Navigation.navigate(ROUTES.WORKSPACE_CARD.getRoute(policy.id)),
         },
         {
             translationKey: 'workspace.common.reimburse',
             icon: Expensicons.Receipt,
-            action: () => Navigation.navigate(ROUTES.getWorkspaceReimburseRoute(policy.id)),
+            action: () => Navigation.navigate(ROUTES.WORKSPACE_REIMBURSE.getRoute(policy.id)),
             error: hasCustomUnitsError,
         },
         {
             translationKey: 'workspace.common.bills',
             icon: Expensicons.Bill,
-            action: () => Navigation.navigate(ROUTES.getWorkspaceBillsRoute(policy.id)),
+            action: () => Navigation.navigate(ROUTES.WORKSPACE_BILLS.getRoute(policy.id)),
         },
         {
             translationKey: 'workspace.common.invoices',
             icon: Expensicons.Invoice,
-            action: () => Navigation.navigate(ROUTES.getWorkspaceInvoicesRoute(policy.id)),
+            action: () => Navigation.navigate(ROUTES.WORKSPACE_INVOICES.getRoute(policy.id)),
         },
         {
             translationKey: 'workspace.common.travel',
             icon: Expensicons.Luggage,
-            action: () => Navigation.navigate(ROUTES.getWorkspaceTravelRoute(policy.id)),
+            action: () => Navigation.navigate(ROUTES.WORKSPACE_TRAVEL.getRoute(policy.id)),
         },
         {
             translationKey: 'workspace.common.members',
             icon: Expensicons.Users,
-            action: () => Navigation.navigate(ROUTES.getWorkspaceMembersRoute(policy.id)),
+            action: () => Navigation.navigate(ROUTES.WORKSPACE_MEMBERS.getRoute(policy.id)),
             brickRoadIndicator: hasMembersError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : '',
         },
         {
@@ -182,11 +182,14 @@ function WorkspaceInitialPage(props) {
     ];
 
     return (
-        <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={WorkspaceInitialPage.displayName}
+        >
             {({safeAreaPaddingBottomStyle}) => (
                 <FullPageNotFoundView
                     onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
-                    shouldShow={_.isEmpty(props.policy) || !PolicyUtils.isPolicyAdmin(props.policy)}
+                    shouldShow={_.isEmpty(props.policy) || !PolicyUtils.isPolicyAdmin(props.policy) || PolicyUtils.isPendingDeletePolicy(props.policy)}
                     subtitleKey={_.isEmpty(props.policy) ? undefined : 'workspace.common.notAuthorized'}
                 >
                     <HeaderWithBackButton
diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.js b/src/pages/workspace/WorkspaceInviteMessagePage.js
index 9a046d7fe4c2..ce9cc730ddbe 100644
--- a/src/pages/workspace/WorkspaceInviteMessagePage.js
+++ b/src/pages/workspace/WorkspaceInviteMessagePage.js
@@ -82,7 +82,7 @@ class WorkspaceInviteMessagePage extends React.Component {
 
     componentDidMount() {
         if (_.isEmpty(this.props.invitedEmailsToAccountIDsDraft)) {
-            Navigation.goBack(ROUTES.getWorkspaceInviteRoute(this.props.route.params.policyID), true);
+            Navigation.goBack(ROUTES.WORKSPACE_INITIAL.getRoute(this.props.route.params.policyID), true);
             return;
         }
         this.focusWelcomeMessageInput();
@@ -122,8 +122,8 @@ class WorkspaceInviteMessagePage extends React.Component {
         Policy.addMembersToWorkspace(this.props.invitedEmailsToAccountIDsDraft, this.state.welcomeNote, this.props.route.params.policyID);
         Policy.setWorkspaceInviteMembersDraft(this.props.route.params.policyID, {});
         // Pop the invite message page before navigating to the members page.
-        Navigation.goBack();
-        Navigation.navigate(ROUTES.getWorkspaceMembersRoute(this.props.route.params.policyID));
+        Navigation.goBack(ROUTES.HOME);
+        Navigation.navigate(ROUTES.WORKSPACE_MEMBERS.getRoute(this.props.route.params.policyID));
     }
 
     /**
@@ -158,9 +158,12 @@ class WorkspaceInviteMessagePage extends React.Component {
         const policyName = lodashGet(this.props.policy, 'name');
 
         return (
-            <ScreenWrapper includeSafeAreaPaddingBottom={false}>
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                testID={WorkspaceInviteMessagePage.displayName}
+            >
                 <FullPageNotFoundView
-                    shouldShow={_.isEmpty(this.props.policy) || !PolicyUtils.isPolicyAdmin(this.props.policy)}
+                    shouldShow={_.isEmpty(this.props.policy) || !PolicyUtils.isPolicyAdmin(this.props.policy) || PolicyUtils.isPendingDeletePolicy(this.props.policy)}
                     subtitleKey={_.isEmpty(this.props.policy) ? undefined : 'workspace.common.notAuthorized'}
                     onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
                 >
@@ -171,7 +174,6 @@ class WorkspaceInviteMessagePage extends React.Component {
                         guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_MEMBERS}
                         shouldShowBackButton
                         onCloseButtonPress={() => Navigation.dismissModal()}
-                        onBackButtonPress={() => Navigation.goBack()}
                     />
                     <Form
                         style={[styles.flexGrow1, styles.ph5]}
diff --git a/src/pages/workspace/WorkspaceInvitePage.js b/src/pages/workspace/WorkspaceInvitePage.js
index b7a1986c06e6..5e57968ab77a 100644
--- a/src/pages/workspace/WorkspaceInvitePage.js
+++ b/src/pages/workspace/WorkspaceInvitePage.js
@@ -177,7 +177,7 @@ function WorkspaceInvitePage(props) {
             invitedEmailsToAccountIDs[login] = Number(accountID);
         });
         Policy.setWorkspaceInviteMembersDraft(props.route.params.policyID, invitedEmailsToAccountIDs);
-        Navigation.navigate(ROUTES.getWorkspaceInviteMessageRoute(props.route.params.policyID));
+        Navigation.navigate(ROUTES.WORKSPACE_INVITE_MESSAGE.getRoute(props.route.params.policyID));
     };
 
     const [policyName, shouldShowAlertPrompt] = useMemo(
@@ -197,13 +197,16 @@ function WorkspaceInvitePage(props) {
     }, [excludedUsers, translate, searchTerm, policyName, userToInvite, personalDetails]);
 
     return (
-        <ScreenWrapper shouldEnableMaxHeight>
+        <ScreenWrapper
+            shouldEnableMaxHeight
+            testID={WorkspaceInvitePage.displayName}
+        >
             {({didScreenTransitionEnd}) => {
                 const sections = didScreenTransitionEnd ? getSections() : [];
 
                 return (
                     <FullPageNotFoundView
-                        shouldShow={(_.isEmpty(props.policy) || !PolicyUtils.isPolicyAdmin(props.policy)) && !props.isLoadingReportData}
+                        shouldShow={((_.isEmpty(props.policy) || !PolicyUtils.isPolicyAdmin(props.policy)) && !props.isLoadingReportData) || PolicyUtils.isPendingDeletePolicy(props.policy)}
                         subtitleKey={_.isEmpty(props.policy) ? undefined : 'workspace.common.notAuthorized'}
                         onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
                     >
@@ -214,7 +217,7 @@ function WorkspaceInvitePage(props) {
                             guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_MEMBERS}
                             onBackButtonPress={() => {
                                 Policy.clearErrors(props.route.params.policyID);
-                                Navigation.goBack(ROUTES.getWorkspaceMembersRoute(props.route.params.policyID));
+                                Navigation.goBack(ROUTES.WORKSPACE_MEMBERS.getRoute(props.route.params.policyID));
                             }}
                         />
                         <SelectionList
@@ -227,7 +230,6 @@ function WorkspaceInvitePage(props) {
                             onSelectRow={toggleOption}
                             onConfirm={inviteUser}
                             showScrollIndicator
-                            shouldDelayFocus
                             showLoadingPlaceholder={!didScreenTransitionEnd || !OptionsListUtils.isPersonalDetailsReady(props.personalDetails)}
                         />
                         <View style={[styles.flexShrink0]}>
diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js
index d598f90e4326..9eff4eba47ee 100644
--- a/src/pages/workspace/WorkspaceMembersPage.js
+++ b/src/pages/workspace/WorkspaceMembersPage.js
@@ -1,4 +1,4 @@
-import React, {useCallback, useEffect, useState} from 'react';
+import React, {useCallback, useEffect, useState, useMemo} from 'react';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import {View} from 'react-native';
@@ -75,6 +75,8 @@ function WorkspaceMembersPage(props) {
     const [errors, setErrors] = useState({});
     const [searchValue, setSearchValue] = useState('');
     const prevIsOffline = usePrevious(props.network.isOffline);
+    const accountIDs = useMemo(() => _.keys(props.policyMembers), [props.policyMembers]);
+    const prevAccountIDs = usePrevious(accountIDs);
 
     /**
      * Get members for the current workspace
@@ -109,6 +111,9 @@ function WorkspaceMembersPage(props) {
     }, [props.preferredLocale, validateSelection]);
 
     useEffect(() => {
+        if (removeMembersConfirmModalVisible && !_.isEqual(accountIDs, prevAccountIDs)) {
+            setRemoveMembersConfirmModalVisible(false);
+        }
         setSelectedEmployees((prevSelected) =>
             _.intersection(
                 prevSelected,
@@ -131,7 +136,7 @@ function WorkspaceMembersPage(props) {
      */
     const inviteUser = () => {
         setSearchValue('');
-        Navigation.navigate(ROUTES.getWorkspaceInviteRoute(props.route.params.policyID));
+        Navigation.navigate(ROUTES.WORKSPACE_INVITE.getRoute(props.route.params.policyID));
     };
 
     /**
@@ -307,6 +312,7 @@ function WorkspaceMembersPage(props) {
 
             result.push({
                 keyForList: accountID,
+                accountID: Number(accountID),
                 isSelected: _.contains(selectedEmployees, Number(accountID)),
                 isDisabled: accountID === props.session.accountID || details.login === props.policy.owner || policyMember.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
                 text: props.formatPhoneNumber(details.displayName),
@@ -338,9 +344,10 @@ function WorkspaceMembersPage(props) {
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
             style={[styles.defaultModalContainer]}
+            testID={WorkspaceMembersPage.displayName}
         >
             <FullPageNotFoundView
-                shouldShow={(_.isEmpty(props.policy) || !PolicyUtils.isPolicyAdmin(props.policy)) && !props.isLoadingReportData}
+                shouldShow={((_.isEmpty(props.policy) || !PolicyUtils.isPolicyAdmin(props.policy)) && !props.isLoadingReportData) || PolicyUtils.isPendingDeletePolicy(props.policy)}
                 subtitleKey={_.isEmpty(props.policy) ? undefined : 'workspace.common.notAuthorized'}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
             >
@@ -349,7 +356,7 @@ function WorkspaceMembersPage(props) {
                     subtitle={policyName}
                     onBackButtonPress={() => {
                         setSearchValue('');
-                        Navigation.goBack(ROUTES.getWorkspaceInitialRoute(policyID));
+                        Navigation.goBack(ROUTES.WORKSPACE_INITIAL.getRoute(policyID));
                     }}
                     shouldShowGetAssistanceButton
                     guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_MEMBERS}
@@ -393,7 +400,6 @@ function WorkspaceMembersPage(props) {
                             onSelectAll={() => toggleAllUsers(data)}
                             onDismissError={dismissError}
                             showLoadingPlaceholder={!OptionsListUtils.isPersonalDetailsReady(props.personalDetails) || _.isEmpty(props.policyMembers)}
-                            shouldDelayFocus
                             showScrollIndicator
                         />
                     </View>
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index 0321394b37bc..d6f58a1b66ad 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -3,13 +3,15 @@ import {View} from 'react-native';
 import _ from 'underscore';
 import {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
+import withNavigationFocus, {withNavigationFocusPropTypes} from '../../components/withNavigationFocus';
 import * as Report from '../../libs/actions/Report';
+import * as App from '../../libs/actions/App';
 import useLocalize from '../../hooks/useLocalize';
-import HeaderWithBackButton from '../../components/HeaderWithBackButton';
-import ScreenWrapper from '../../components/ScreenWrapper';
 import styles from '../../styles/styles';
 import RoomNameInput from '../../components/RoomNameInput';
 import Picker from '../../components/Picker';
+import KeyboardAvoidingView from '../../components/KeyboardAvoidingView';
+import ScreenWrapper from '../../components/ScreenWrapper';
 import ONYXKEYS from '../../ONYXKEYS';
 import CONST from '../../CONST';
 import Text from '../../components/Text';
@@ -19,9 +21,10 @@ import * as ValidationUtils from '../../libs/ValidationUtils';
 import * as ReportUtils from '../../libs/ReportUtils';
 import * as PolicyUtils from '../../libs/PolicyUtils';
 import Form from '../../components/Form';
-import shouldDelayFocus from '../../libs/shouldDelayFocus';
 import policyMemberPropType from '../policyMemberPropType';
 import FullPageNotFoundView from '../../components/BlockingViews/FullPageNotFoundView';
+import compose from '../../libs/compose';
+import variables from '../../styles/variables';
 
 const propTypes = {
     /** All reports shared with the user */
@@ -55,6 +58,8 @@ const propTypes = {
 
     /** A collection of objects for all policies which key policy member objects by accountIDs */
     allPolicyMembers: PropTypes.objectOf(PropTypes.objectOf(policyMemberPropType)),
+
+    ...withNavigationFocusPropTypes,
 };
 const defaultProps = {
     betas: [],
@@ -140,60 +145,78 @@ function WorkspaceNewRoomPage(props) {
     );
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            shouldEnablePickerAvoiding={false}
+        <FullPageNotFoundView
+            shouldShow={!Permissions.canUsePolicyRooms(props.betas) || !workspaceOptions.length}
+            shouldShowBackButton={false}
+            linkKey="workspace.emptyWorkspace.title"
+            onLinkPress={() => App.createWorkspaceAndNavigateToIt('', false, '', false, false)}
         >
-            <FullPageNotFoundView shouldShow={!Permissions.canUsePolicyRooms(props.betas) || !workspaceOptions.length}>
-                <HeaderWithBackButton title={translate('newRoomPage.newRoom')} />
-                <Form
-                    formID={ONYXKEYS.FORMS.NEW_ROOM_FORM}
-                    submitButtonText={translate('newRoomPage.createRoom')}
-                    scrollContextEnabled
-                    style={[styles.mh5, styles.flexGrow1]}
-                    validate={validate}
-                    onSubmit={submit}
-                    enabledWhenOffline
-                >
-                    <View style={styles.mb5}>
-                        <RoomNameInput
-                            inputID="roomName"
-                            autoFocus
-                            shouldDelayFocus={shouldDelayFocus}
-                        />
-                    </View>
-                    <View style={styles.mb2}>
-                        <Picker
-                            inputID="policyID"
-                            label={translate('workspace.common.workspace')}
-                            placeholder={{value: '', label: translate('newRoomPage.selectAWorkspace')}}
-                            items={workspaceOptions}
-                            onValueChange={setPolicyID}
-                        />
-                    </View>
-                    {isPolicyAdmin && (
-                        <View style={styles.mb2}>
-                            <Picker
-                                inputID="writeCapability"
-                                label={translate('writeCapabilityPage.label')}
-                                items={writeCapabilityOptions}
-                                defaultValue={CONST.REPORT.WRITE_CAPABILITIES.ALL}
-                            />
-                        </View>
-                    )}
-                    <View style={styles.mb2}>
-                        <Picker
-                            inputID="visibility"
-                            label={translate('newRoomPage.visibility')}
-                            items={visibilityOptions}
-                            onValueChange={setVisibility}
-                            defaultValue={CONST.REPORT.VISIBILITY.RESTRICTED}
-                        />
-                    </View>
-                    <Text style={[styles.textLabel, styles.colorMuted]}>{visibilityDescription}</Text>
-                </Form>
-            </FullPageNotFoundView>
-        </ScreenWrapper>
+            <ScreenWrapper
+                shouldEnableKeyboardAvoidingView={false}
+                includeSafeAreaPaddingBottom={false}
+                includePaddingTop={false}
+                shouldEnablePickerAvoiding={false}
+                testID={WorkspaceNewRoomPage.displayName}
+            >
+                {({insets}) => (
+                    <KeyboardAvoidingView
+                        style={{height: '100%'}}
+                        behavior="height"
+                        // Offset is needed as KeyboardAvoidingView in nested inside of TabNavigator instead of wrapping whole screen.
+                        // This is because when wrapping whole screen the screen was freezing when changing Tabs.
+                        keyboardVerticalOffset={variables.contentHeaderHeight + variables.tabSelectorButtonHeight + variables.tabSelectorButtonPadding + insets.top}
+                    >
+                        <Form
+                            formID={ONYXKEYS.FORMS.NEW_ROOM_FORM}
+                            submitButtonText={translate('newRoomPage.createRoom')}
+                            scrollContextEnabled
+                            style={[styles.mh5, styles.flexGrow1]}
+                            validate={validate}
+                            onSubmit={submit}
+                            enabledWhenOffline
+                        >
+                            <View style={styles.mb5}>
+                                <RoomNameInput
+                                    inputID="roomName"
+                                    isFocused={props.isFocused}
+                                    shouldDelayFocus
+                                    autoFocus
+                                />
+                            </View>
+                            <View style={styles.mb2}>
+                                <Picker
+                                    inputID="policyID"
+                                    label={translate('workspace.common.workspace')}
+                                    placeholder={{value: '', label: translate('newRoomPage.selectAWorkspace')}}
+                                    items={workspaceOptions}
+                                    onValueChange={setPolicyID}
+                                />
+                            </View>
+                            {isPolicyAdmin && (
+                                <View style={styles.mb2}>
+                                    <Picker
+                                        inputID="writeCapability"
+                                        label={translate('writeCapabilityPage.label')}
+                                        items={writeCapabilityOptions}
+                                        defaultValue={CONST.REPORT.WRITE_CAPABILITIES.ALL}
+                                    />
+                                </View>
+                            )}
+                            <View style={styles.mb2}>
+                                <Picker
+                                    inputID="visibility"
+                                    label={translate('newRoomPage.visibility')}
+                                    items={visibilityOptions}
+                                    onValueChange={setVisibility}
+                                    defaultValue={CONST.REPORT.VISIBILITY.RESTRICTED}
+                                />
+                            </View>
+                            <Text style={[styles.textLabel, styles.colorMuted]}>{visibilityDescription}</Text>
+                        </Form>
+                    </KeyboardAvoidingView>
+                )}
+            </ScreenWrapper>
+        </FullPageNotFoundView>
     );
 }
 
@@ -201,17 +224,20 @@ WorkspaceNewRoomPage.propTypes = propTypes;
 WorkspaceNewRoomPage.defaultProps = defaultProps;
 WorkspaceNewRoomPage.displayName = 'WorkspaceNewRoomPage';
 
-export default withOnyx({
-    betas: {
-        key: ONYXKEYS.BETAS,
-    },
-    policies: {
-        key: ONYXKEYS.COLLECTION.POLICY,
-    },
-    reports: {
-        key: ONYXKEYS.COLLECTION.REPORT,
-    },
-    allPolicyMembers: {
-        key: ONYXKEYS.COLLECTION.POLICY_MEMBERS,
-    },
-})(WorkspaceNewRoomPage);
+export default compose(
+    withNavigationFocus,
+    withOnyx({
+        betas: {
+            key: ONYXKEYS.BETAS,
+        },
+        policies: {
+            key: ONYXKEYS.COLLECTION.POLICY,
+        },
+        reports: {
+            key: ONYXKEYS.COLLECTION.REPORT,
+        },
+        allPolicyMembers: {
+            key: ONYXKEYS.COLLECTION.POLICY_MEMBERS,
+        },
+    }),
+)(WorkspaceNewRoomPage);
diff --git a/src/pages/workspace/WorkspacePageWithSections.js b/src/pages/workspace/WorkspacePageWithSections.js
index fa04f5cfc49e..fbe950248062 100644
--- a/src/pages/workspace/WorkspacePageWithSections.js
+++ b/src/pages/workspace/WorkspacePageWithSections.js
@@ -102,10 +102,11 @@ function WorkspacePageWithSections({backButtonRoute, children, footer, guidesCal
             includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
+            testID={WorkspacePageWithSections.displayName}
         >
             <FullPageNotFoundView
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
-                shouldShow={_.isEmpty(policy) || !PolicyUtils.isPolicyAdmin(policy)}
+                shouldShow={_.isEmpty(policy) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy)}
                 subtitleKey={_.isEmpty(policy) ? undefined : 'workspace.common.notAuthorized'}
             >
                 <HeaderWithBackButton
@@ -113,7 +114,7 @@ function WorkspacePageWithSections({backButtonRoute, children, footer, guidesCal
                     subtitle={policyName}
                     shouldShowGetAssistanceButton
                     guidesCallTaskID={guidesCallTaskID}
-                    onBackButtonPress={() => Navigation.goBack(backButtonRoute || ROUTES.getWorkspaceInitialRoute(policyID))}
+                    onBackButtonPress={() => Navigation.goBack(backButtonRoute || ROUTES.WORKSPACE_INITIAL.getRoute(policyID))}
                 />
                 {shouldUseScrollView ? (
                     <ScrollViewWithContext
@@ -133,6 +134,7 @@ function WorkspacePageWithSections({backButtonRoute, children, footer, guidesCal
 
 WorkspacePageWithSections.propTypes = propTypes;
 WorkspacePageWithSections.defaultProps = defaultProps;
+WorkspacePageWithSections.displayName = 'WorkspacePageWithSections';
 
 export default compose(
     withOnyx({
diff --git a/src/pages/workspace/WorkspaceSettingsPage.js b/src/pages/workspace/WorkspaceSettingsPage.js
index 7aff9093c4dd..0f1f6c283a6b 100644
--- a/src/pages/workspace/WorkspaceSettingsPage.js
+++ b/src/pages/workspace/WorkspaceSettingsPage.js
@@ -20,6 +20,7 @@ import {withNetwork} from '../../components/OnyxProvider';
 import OfflineWithFeedback from '../../components/OfflineWithFeedback';
 import Form from '../../components/Form';
 import * as ReportUtils from '../../libs/ReportUtils';
+import * as UserUtils from '../../libs/UserUtils';
 import Avatar from '../../components/Avatar';
 import Navigation from '../../libs/Navigation/Navigation';
 import ROUTES from '../../ROUTES';
@@ -60,7 +61,7 @@ function WorkspaceSettingsPage(props) {
             const outputCurrency = values.currency;
             Policy.updateGeneralSettings(props.policy.id, values.name.trim(), outputCurrency);
             Keyboard.dismiss();
-            Navigation.goBack(ROUTES.getWorkspaceInitialRoute(props.policy.id));
+            Navigation.goBack(ROUTES.WORKSPACE_INITIAL.getRoute(props.policy.id));
         },
         [props.policy.id, props.policy.isPolicyUpdating],
     );
@@ -125,6 +126,9 @@ function WorkspaceSettingsPage(props) {
                         pendingAction={lodashGet(props.policy, 'pendingFields.avatar', null)}
                         errors={lodashGet(props.policy, 'errorFields.avatar', null)}
                         onErrorClose={() => Policy.clearAvatarErrors(props.policy.id)}
+                        previewSource={UserUtils.getFullSizeAvatar(props.policy.avatar, '')}
+                        headerTitle={props.translate('workspace.common.workspaceAvatar')}
+                        originalFileName={props.policy.originalFileName}
                     />
                     <OfflineWithFeedback pendingAction={lodashGet(props.policy, 'pendingFields.generalSettings')}>
                         <TextInput
diff --git a/src/pages/workspace/WorkspacesListPage.js b/src/pages/workspace/WorkspacesListPage.js
index 6ba92d8c611a..369e84bab5d0 100755
--- a/src/pages/workspace/WorkspacesListPage.js
+++ b/src/pages/workspace/WorkspacesListPage.js
@@ -170,7 +170,7 @@ function WorkspacesListPage({policies, allPolicyMembers, reimbursementAccount, u
                 title: policy.name,
                 icon: policy.avatar ? policy.avatar : ReportUtils.getDefaultWorkspaceAvatar(policy.name),
                 iconType: policy.avatar ? CONST.ICON_TYPE_AVATAR : CONST.ICON_TYPE_ICON,
-                action: () => Navigation.navigate(ROUTES.getWorkspaceInitialRoute(policy.id)),
+                action: () => Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(policy.id)),
                 iconFill: themeColors.textLight,
                 fallbackIcon: Expensicons.FallbackWorkspaceAvatar,
                 brickRoadIndicator: reimbursementAccountBrickRoadIndicator || PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy, allPolicyMembers),
diff --git a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js
index e551e0d6d1b9..d2cffdd471d2 100644
--- a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js
+++ b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js
@@ -7,6 +7,7 @@ import withLocalize, {withLocalizePropTypes} from '../../../components/withLocal
 import styles from '../../../styles/styles';
 import compose from '../../../libs/compose';
 import * as Policy from '../../../libs/actions/Policy';
+import * as PolicyUtils from '../../../libs/PolicyUtils';
 import CONST from '../../../CONST';
 import Picker from '../../../components/Picker';
 import TextInput from '../../../components/TextInput';
@@ -35,33 +36,13 @@ class WorkspaceRateAndUnitPage extends React.Component {
         this.validate = this.validate.bind(this);
     }
 
-    getUnitRateValue(customUnitRate) {
-        return this.getRateDisplayValue(lodashGet(customUnitRate, 'rate', 0) / CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET);
-    }
-
     getUnitItems() {
         return [
-            {label: this.props.translate('workspace.reimburse.kilometers'), value: CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS},
+            {label: this.props.translate('common.kilometers'), value: CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS},
             {label: this.props.translate('common.miles'), value: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES},
         ];
     }
 
-    getRateDisplayValue(value) {
-        const numValue = this.getNumericValue(value);
-        if (Number.isNaN(numValue)) {
-            return '';
-        }
-        return numValue.toString().replace('.', this.props.toLocaleDigit('.')).substring(0, value.length);
-    }
-
-    getNumericValue(value) {
-        const numValue = parseFloat(value.toString().replace(',', '.'));
-        if (Number.isNaN(numValue)) {
-            return NaN;
-        }
-        return numValue.toFixed(3);
-    }
-
     saveUnitAndRate(unit, rate) {
         const distanceCustomUnit = _.find(lodashGet(this.props, 'policy.customUnits', {}), (u) => u.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
         if (!distanceCustomUnit) {
@@ -70,7 +51,7 @@ class WorkspaceRateAndUnitPage extends React.Component {
         const currentCustomUnitRate = _.find(lodashGet(distanceCustomUnit, 'rates', {}), (r) => r.name === CONST.CUSTOM_UNITS.DEFAULT_RATE);
         const unitID = lodashGet(distanceCustomUnit, 'customUnitID', '');
         const unitName = lodashGet(distanceCustomUnit, 'name', '');
-        const rateNumValue = this.getNumericValue(rate);
+        const rateNumValue = PolicyUtils.getNumericValue(rate, this.props.toLocaleDigit);
 
         const newCustomUnit = {
             customUnitID: unitID,
@@ -87,7 +68,7 @@ class WorkspaceRateAndUnitPage extends React.Component {
     submit(values) {
         this.saveUnitAndRate(values.unit, values.rate);
         Keyboard.dismiss();
-        Navigation.goBack(ROUTES.getWorkspaceReimburseRoute(this.props.policy.id));
+        Navigation.goBack(ROUTES.WORKSPACE_REIMBURSE.getRoute(this.props.policy.id));
     }
 
     validate(values) {
@@ -111,7 +92,7 @@ class WorkspaceRateAndUnitPage extends React.Component {
                 route={this.props.route}
                 guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_REIMBURSE}
                 shouldSkipVBBACall
-                backButtonRoute={ROUTES.getWorkspaceReimburseRoute(this.props.policy.id)}
+                backButtonRoute={ROUTES.WORKSPACE_REIMBURSE.getRoute(this.props.policy.id)}
             >
                 {() => (
                     <Form
@@ -137,7 +118,7 @@ class WorkspaceRateAndUnitPage extends React.Component {
                                 accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
                                 inputID="rate"
                                 containerStyles={[styles.mt4]}
-                                defaultValue={this.getUnitRateValue(distanceCustomRate)}
+                                defaultValue={PolicyUtils.getUnitRateValue(distanceCustomRate, this.props.toLocaleDigit)}
                                 label={this.props.translate('workspace.reimburse.trackDistanceRate')}
                                 accessibilityLabel={this.props.translate('workspace.reimburse.trackDistanceRate')}
                                 placeholder={lodashGet(this.props, 'policy.outputCurrency', CONST.CURRENCY.USD)}
diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseView.js b/src/pages/workspace/reimburse/WorkspaceReimburseView.js
index 6a4a3ecc207b..6b520b65eff2 100644
--- a/src/pages/workspace/reimburse/WorkspaceReimburseView.js
+++ b/src/pages/workspace/reimburse/WorkspaceReimburseView.js
@@ -16,6 +16,7 @@ import CopyTextToClipboard from '../../../components/CopyTextToClipboard';
 import * as Link from '../../../libs/actions/Link';
 import compose from '../../../libs/compose';
 import * as Policy from '../../../libs/actions/Policy';
+import * as PolicyUtils from '../../../libs/PolicyUtils';
 import CONST from '../../../CONST';
 import ROUTES from '../../../ROUTES';
 import ONYXKEYS from '../../../ONYXKEYS';
@@ -71,39 +72,15 @@ function WorkspaceReimburseView(props) {
     const distanceCustomRate = _.find(lodashGet(distanceCustomUnit, 'rates', {}), (rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE);
     const {translate, toLocaleDigit} = props;
 
-    const getNumericValue = useCallback(
-        (value) => {
-            const numValue = parseFloat(value.toString().replace(toLocaleDigit('.'), '.'));
-            if (Number.isNaN(numValue)) {
-                return NaN;
-            }
-            return numValue.toFixed(3);
-        },
-        [toLocaleDigit],
-    );
-
-    const getRateDisplayValue = useCallback(
-        (value) => {
-            const numValue = getNumericValue(value);
-            if (Number.isNaN(numValue)) {
-                return '';
-            }
-            return numValue.toString().replace('.', toLocaleDigit('.')).substring(0, value.length);
-        },
-        [getNumericValue, toLocaleDigit],
-    );
-
-    const getRateLabel = useCallback((customUnitRate) => getRateDisplayValue(lodashGet(customUnitRate, 'rate', 0) / CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET), [getRateDisplayValue]);
-
     const getUnitLabel = useCallback((value) => translate(`common.${value}`), [translate]);
 
     const getCurrentRatePerUnitLabel = useCallback(() => {
         const customUnitRate = _.find(lodashGet(distanceCustomUnit, 'rates', '{}'), (rate) => rate && rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE);
         const currentUnit = getUnitLabel(lodashGet(distanceCustomUnit, 'attributes.unit', CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES));
-        const currentRate = getRateLabel(customUnitRate);
+        const currentRate = PolicyUtils.getUnitRateValue(customUnitRate, toLocaleDigit);
         const perWord = translate('common.per');
         return `${currentRate} ${perWord} ${currentUnit}`;
-    }, [translate, distanceCustomUnit, getUnitLabel, getRateLabel]);
+    }, [translate, distanceCustomUnit, toLocaleDigit, getUnitLabel]);
 
     const fetchData = useCallback(() => {
         // Instead of setting the reimbursement account loading within the optimistic data of the API command, use a separate action so that the Onyx value is updated right away.
@@ -168,7 +145,7 @@ function WorkspaceReimburseView(props) {
                         title={currentRatePerUnit}
                         description={translate('workspace.reimburse.trackDistanceRate')}
                         shouldShowRightIcon
-                        onPress={() => Navigation.navigate(ROUTES.getWorkspaceRateAndUnitRoute(props.policy.id))}
+                        onPress={() => Navigation.navigate(ROUTES.WORKSPACE_RATE_AND_UNIT.getRoute(props.policy.id))}
                         wrapperStyle={[styles.mhn5, styles.wAuto]}
                         brickRoadIndicator={(lodashGet(distanceCustomUnit, 'errors') || lodashGet(distanceCustomRate, 'errors')) && CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR}
                     />
diff --git a/src/stories/ButtonWithDropdownMenu.stories.js b/src/stories/ButtonWithDropdownMenu.stories.js
index 854483df4316..7629a6ff0e17 100644
--- a/src/stories/ButtonWithDropdownMenu.stories.js
+++ b/src/stories/ButtonWithDropdownMenu.stories.js
@@ -20,7 +20,7 @@ function Template(args) {
 // See: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
 const Default = Template.bind({});
 Default.args = {
-    buttonText: 'Pay with PayPal.me',
+    buttonText: 'Pay using Expensify',
     options: [
         {value: 1, text: 'One'},
         {value: 2, text: 'Two'},
diff --git a/src/stories/PopoverMenu.stories.js b/src/stories/PopoverMenu.stories.js
index 1098fa9ce226..5f8fb8994e1f 100644
--- a/src/stories/PopoverMenu.stories.js
+++ b/src/stories/PopoverMenu.stories.js
@@ -44,11 +44,6 @@ function Template(args) {
                             icon: Expensicons.CreditCard,
                             onSelected: toggleVisibility,
                         },
-                        {
-                            text: 'PayPal.me',
-                            icon: Expensicons.PayPal,
-                            onSelected: toggleVisibility,
-                        },
                     ]}
                 />
             </SafeAreaProvider>
diff --git a/src/styles/StyleUtils.ts b/src/styles/StyleUtils.ts
index 8945bc0be058..ad1b59ec2253 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>;
@@ -26,6 +25,7 @@ type AvatarSizeValue = ValueOf<
         | 'avatarSizeSubscript'
         | 'avatarSizeSmall'
         | 'avatarSizeSmaller'
+        | 'avatarSizeXLarge'
         | 'avatarSizeLarge'
         | 'avatarSizeMedium'
         | 'avatarSizeLargeBordered'
@@ -96,6 +96,7 @@ const avatarBorderSizes: Partial<Record<AvatarSizeName, number>> = {
     [CONST.AVATAR_SIZE.DEFAULT]: variables.componentBorderRadiusNormal,
     [CONST.AVATAR_SIZE.MEDIUM]: variables.componentBorderRadiusLarge,
     [CONST.AVATAR_SIZE.LARGE]: variables.componentBorderRadiusLarge,
+    [CONST.AVATAR_SIZE.XLARGE]: variables.componentBorderRadiusLarge,
     [CONST.AVATAR_SIZE.LARGE_BORDERED]: variables.componentBorderRadiusRounded,
     [CONST.AVATAR_SIZE.SMALL_NORMAL]: variables.componentBorderRadiusMedium,
 };
@@ -108,6 +109,7 @@ const avatarSizes: Record<AvatarSizeName, AvatarSizeValue> = {
     [CONST.AVATAR_SIZE.SMALL]: variables.avatarSizeSmall,
     [CONST.AVATAR_SIZE.SMALLER]: variables.avatarSizeSmaller,
     [CONST.AVATAR_SIZE.LARGE]: variables.avatarSizeLarge,
+    [CONST.AVATAR_SIZE.XLARGE]: variables.avatarSizeXLarge,
     [CONST.AVATAR_SIZE.MEDIUM]: variables.avatarSizeMedium,
     [CONST.AVATAR_SIZE.LARGE_BORDERED]: variables.avatarSizeLargeBordered,
     [CONST.AVATAR_SIZE.HEADER]: variables.avatarSizeHeader,
@@ -259,9 +261,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 +341,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 +448,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,48 +574,20 @@ 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 {
+function getReportActionItemStyle(isHovered = 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,
-        opacity: isLoading ? 0.5 : 1,
+              themeColors.transparent,
+        opacity: 1,
         ...styles.cursorInitial,
     };
 }
@@ -609,6 +596,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,
@@ -949,11 +938,9 @@ function getBaseAutoCompleteSuggestionContainerStyle({left, bottom, width}: {lef
 /**
  * Gets the correct position for auto complete suggestion container
  */
-function getAutoCompleteSuggestionContainerStyle(itemsHeight: number, shouldIncludeReportRecipientLocalTimeHeight: boolean): ViewStyle | CSSProperties {
+function getAutoCompleteSuggestionContainerStyle(itemsHeight: number): ViewStyle | CSSProperties {
     'worklet';
 
-    const optionalPadding = shouldIncludeReportRecipientLocalTimeHeight ? CONST.RECIPIENT_LOCAL_TIME_HEIGHT : 0;
-    const padding = CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTER_PADDING + optionalPadding;
     const borderWidth = 2;
     const height = itemsHeight + 2 * CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTER_INNER_PADDING + borderWidth;
 
@@ -961,7 +948,7 @@ function getAutoCompleteSuggestionContainerStyle(itemsHeight: number, shouldIncl
     // we need to shift it by the suggester's height plus its padding and, if applicable, the height of the RecipientLocalTime view.
     return {
         overflow: 'hidden',
-        top: -(height + padding),
+        top: -(height + CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTER_PADDING),
         height,
     };
 }
@@ -970,7 +957,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 +1005,7 @@ function getEmojiReactionCounterTextStyle(hasUserReacted: boolean): TextStyle |
         return {color: themeColors.reactionActiveText};
     }
 
-    return {color: themeColors.textLight};
+    return {color: themeColors.text};
 }
 
 /**
@@ -1043,6 +1030,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 +1139,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 +1242,6 @@ export {
     getModalPaddingStyles,
     getFontFamilyMonospace,
     getEmojiPickerStyle,
-    getLoginPagePromoStyle,
     getReportActionItemStyle,
     getMiniReportActionContextMenuWrapperStyle,
     getKeyboardShortcutsModalWidth,
diff --git a/src/styles/ThemeStylesProvider.js b/src/styles/ThemeStylesProvider.js
deleted file mode 100644
index 4653605fc079..000000000000
--- a/src/styles/ThemeStylesProvider.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/* eslint-disable react/jsx-props-no-spreading */
-import React, {useMemo} from 'react';
-import PropTypes from 'prop-types';
-import useTheme from './themes/useTheme';
-import StylesContext from './ThemeStylesContext';
-import defaultStyles from './styles';
-
-const propTypes = {
-    /** Rendered child component */
-    children: PropTypes.node.isRequired,
-};
-
-function ThemeStylesProvider(props) {
-    const theme = useTheme();
-
-    const appContentStyle = useMemo(
-        () => ({
-            ...defaultStyles.appContent,
-            backgroundColor: theme.appBG,
-        }),
-        [theme.appBG],
-    );
-
-    const styles = useMemo(
-        () => ({
-            ...defaultStyles,
-            appContent: appContentStyle,
-        }),
-        [appContentStyle],
-    );
-
-    return <StylesContext.Provider value={styles}>{props.children}</StylesContext.Provider>;
-}
-ThemeStylesProvider.propTypes = propTypes;
-ThemeStylesProvider.displayName = 'ThemeStylesProvider';
-
-export default ThemeStylesProvider;
diff --git a/src/styles/ThemeStylesProvider.tsx b/src/styles/ThemeStylesProvider.tsx
new file mode 100644
index 000000000000..d0db784ca8ca
--- /dev/null
+++ b/src/styles/ThemeStylesProvider.tsx
@@ -0,0 +1,24 @@
+/* eslint-disable react/jsx-props-no-spreading */
+import React, {useMemo} from 'react';
+import useTheme from './themes/useTheme';
+import ThemeStylesContext from './ThemeStylesContext';
+// TODO: Rename this to "styles" once the app is migrated to theme switching hooks and HOCs
+import {stylesGenerator as stylesUntyped} from './styles';
+
+const styles = stylesUntyped as (theme: Record<string, string>) => Record<string, unknown>;
+
+type ThemeStylesProviderProps = {
+    children: React.ReactNode;
+};
+
+function ThemeStylesProvider({children}: ThemeStylesProviderProps) {
+    const theme = useTheme();
+
+    const themeStyles = useMemo(() => styles(theme), [theme]);
+
+    return <ThemeStylesContext.Provider value={themeStyles}>{children}</ThemeStylesContext.Provider>;
+}
+
+ThemeStylesProvider.displayName = 'ThemeStylesProvider';
+
+export default ThemeStylesProvider;
diff --git a/src/styles/animation/SpinningIndicatorAnimation.js b/src/styles/animation/SpinningIndicatorAnimation.js
index 8e7fd0277221..29044f0d127a 100644
--- a/src/styles/animation/SpinningIndicatorAnimation.js
+++ b/src/styles/animation/SpinningIndicatorAnimation.js
@@ -42,7 +42,7 @@ class SpinningIndicatorAnimation {
             toValue: 1.666,
             tension: 1,
             isInteraction: false,
-            useNativeDriver: true,
+            useNativeDriver,
         }).start();
     }
 
@@ -56,7 +56,7 @@ class SpinningIndicatorAnimation {
             toValue: 1,
             tension: 1,
             isInteraction: false,
-            useNativeDriver: true,
+            useNativeDriver,
         }).start(() => {
             this.rotate.resetAnimation();
             this.scale.resetAnimation();
diff --git a/src/styles/cardStyles/index.js b/src/styles/cardStyles/index.js
deleted file mode 100644
index d8af8a627ffe..000000000000
--- a/src/styles/cardStyles/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Get card style for cardStyleInterpolator
- * @param {Number} screenWidth
- * @returns {Object}
- */
-export default function getCardStyles(screenWidth) {
-    return {
-        position: 'fixed',
-        width: screenWidth,
-        height: '100%',
-    };
-}
diff --git a/src/styles/cardStyles/index.native.js b/src/styles/cardStyles/index.native.js
deleted file mode 100644
index fef33f500708..000000000000
--- a/src/styles/cardStyles/index.native.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function getCardStyles() {
-    return {};
-}
diff --git a/src/styles/cardStyles/index.native.ts b/src/styles/cardStyles/index.native.ts
new file mode 100644
index 000000000000..94b8758efd05
--- /dev/null
+++ b/src/styles/cardStyles/index.native.ts
@@ -0,0 +1,5 @@
+import GetCardStyles from './types';
+
+const getCardStyles: GetCardStyles = () => ({});
+
+export default getCardStyles;
diff --git a/src/styles/cardStyles/index.ts b/src/styles/cardStyles/index.ts
new file mode 100644
index 000000000000..823081b62904
--- /dev/null
+++ b/src/styles/cardStyles/index.ts
@@ -0,0 +1,12 @@
+import GetCardStyles from './types';
+
+/**
+ * Get card style for cardStyleInterpolator
+ */
+const getCardStyles: GetCardStyles = (screenWidth) => ({
+    position: 'fixed',
+    width: screenWidth,
+    height: '100%',
+});
+
+export default getCardStyles;
diff --git a/src/styles/cardStyles/types.ts b/src/styles/cardStyles/types.ts
new file mode 100644
index 000000000000..e1598b7696ff
--- /dev/null
+++ b/src/styles/cardStyles/types.ts
@@ -0,0 +1,6 @@
+import {CSSProperties} from 'react';
+import {ViewStyle} from 'react-native';
+
+type GetCardStyles = (screenWidth: number) => Partial<Pick<CSSProperties | ViewStyle, 'position' | 'width' | 'height'>>;
+
+export default GetCardStyles;
diff --git a/src/styles/colors.js b/src/styles/colors.js
index 3ee155be58d2..9ac3226a1b80 100644
--- a/src/styles/colors.js
+++ b/src/styles/colors.js
@@ -2,44 +2,44 @@
  * DO NOT import colors.js into files. Use ../themes/default.js instead.
  */
 export default {
-    dark: '#0b1b34',
     black: '#000000',
-    blue: '#0185ff',
-    blueHover: '#B0D9FF',
+    white: '#FFFFFF',
     ivory: '#fffaf0',
-    orange: '#FF7101',
-    pink: '#F68DFE',
     green: '#03D47C',
     greenHover: '#00C271',
     greenPressed: '#35DD96',
-    greenDisabled: '80E9BD',
     red: '#F25730',
     redHover: '#DE4822',
     redPressed: '#F57959',
-    redDisabled: '#F8AA97',
-    yellow: '#FED607',
     transparent: 'transparent',
 
     // Dark Mode Theme Colors
-    greenAppBackground: '#061B09',
-    greenHighlightBackground: '#07271F',
-    greenBorders: '#1A3D32',
-    greenBordersLighter: '#2B5548',
-    greenIcons: '#8B9C8F',
-    greenSupportingText: '#AFBBB0',
-    white: '#E7ECE9',
-    blueLink: '#5AB0FF',
-    blueLinkHover: '#B0D9FF',
-    blueLinkPreview: '#2EAAE2',
-    greenDefaultButton: '#184E3D',
-    greenDefaultButtonHover: '#2C6755',
-    greenDefaultButtonPressed: '#467164',
-    greenDefaultButtonDisabled: '#8BA69E',
-    midnight: '#002140',
+    darkAppBackground: '#061B09',
+    darkHighlightBackground: '#07271F',
+    darkBorders: '#1A3D32',
+    darkIcons: '#8B9C8F',
+    darkSupportingText: '#AFBBB0',
+    darkPrimaryText: '#E7ECE9',
+    darkDefaultButton: '#184E3D',
+    darkDefaultButtonHover: '#2C6755',
+    darkDefaultButtonPressed: '#467164',
+
+    // Light Mode Theme Colors
+    lightAppBackground: '#FCFBF9',
+    lightHighlightBackground: '#F8F4F0',
+    lightBorders: '#EBE6DF',
+    lightBordersLighter: '#2B5548',
+    lightIcons: '#A2A9A3',
+    lightSupportingText: '#76847E',
+    lightPrimaryText: '#002E22',
+    lightDefaultButton: '#EEEBE7',
+    lightDefaultButtonHover: '#E3DFD9',
+    lightDefaultButtonPressed: '#D2CCC3',
 
     // Brand Colors from Figma
     blue100: '#B0D9FF',
     blue200: '#8DC8FF',
+    blue300: '#5AB0FF',
     blue400: '#0185FF',
     blue500: '#0676DE',
     blue600: '#0164BF',
@@ -48,40 +48,46 @@ export default {
 
     green100: '#B1F2D6',
     green200: '#8EECC4',
+    green300: '#5BE3AA',
     green400: '#03D47C',
+    green500: '#00B268',
     green600: '#008C59',
     green700: '#085239',
     green800: '#002E22',
 
+    yellow100: '#FFF2B2',
     yellow200: '#FFED8F',
+    yellow300: '#FEE45E',
     yellow400: '#FED607',
+    yellow500: '#E4BC07',
+    yellow600: '#D18000',
     yellow700: '#722B03',
     yellow800: '#401102',
 
+    tangerine100: '#FFD7B0',
     tangerine200: '#FFC68C',
+    tangerine300: '#FFA75A',
     tangerine400: '#FF7101',
+    tangerine500: '#F25730',
+    tangerine600: '#BF3013',
     tangerine700: '#780505',
     tangerine800: '#400000',
 
+    pink100: '#FCDCFF',
     pink200: '#FBCCFF',
+    pink300: '#F9B5FE',
     pink400: '#F68DFE',
+    pink500: '#E96DF2',
     pink600: '#CF4CD9',
     pink700: '#712A76',
     pink800: '#49225B',
 
+    ice100: '#DFFDFE',
     ice200: '#CCF7FF',
+    ice300: '#A5FBFF',
     ice400: '#50EEF6',
+    ice500: '#4ED7DE',
+    ice600: '#4BA6A6',
     ice700: '#28736D',
     ice800: '#134038',
-
-    orange800: '#400000',
-
-    // DEPRECATED COLORS. Do not reference these colors. Will be deleted in color switch PR.
-    gray1: '#FAFAFA',
-    gray2: '#ECECEC',
-    gray3: '#C6C9CA',
-    gray4: '#7D8B8F',
-    oldRed: '#fc3826',
-    oldRedHover: '#e13826',
-    oldRedDisabled: '#fea29a',
 };
diff --git a/src/styles/containerComposeStyles/index.native.js b/src/styles/containerComposeStyles/index.native.js
deleted file mode 100644
index 002331581108..000000000000
--- a/src/styles/containerComposeStyles/index.native.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import styles from '../styles';
-
-const containerComposeStyles = [styles.textInputComposeSpacing];
-
-export default containerComposeStyles;
diff --git a/src/styles/containerComposeStyles/index.native.ts b/src/styles/containerComposeStyles/index.native.ts
new file mode 100644
index 000000000000..6b6bcf71cfcf
--- /dev/null
+++ b/src/styles/containerComposeStyles/index.native.ts
@@ -0,0 +1,6 @@
+import {StyleProp, ViewStyle} from 'react-native';
+import styles from '../styles';
+
+const containerComposeStyles: StyleProp<ViewStyle> = [styles.textInputComposeSpacing];
+
+export default containerComposeStyles;
diff --git a/src/styles/containerComposeStyles/index.js b/src/styles/containerComposeStyles/index.ts
similarity index 55%
rename from src/styles/containerComposeStyles/index.js
rename to src/styles/containerComposeStyles/index.ts
index 23a4d7ed7720..6968e23a507e 100644
--- a/src/styles/containerComposeStyles/index.js
+++ b/src/styles/containerComposeStyles/index.ts
@@ -1,6 +1,7 @@
+import {StyleProp, ViewStyle} from 'react-native';
 import styles from '../styles';
 
 // We need to set paddingVertical = 0 on web to avoid displaying a normal pointer on some parts of compose box when not in focus
-const containerComposeStyles = [styles.textInputComposeSpacing, {paddingVertical: 0}];
+const containerComposeStyles: StyleProp<ViewStyle> = [styles.textInputComposeSpacing, {paddingVertical: 0}];
 
 export default containerComposeStyles;
diff --git a/src/styles/fontWeight/bold/index.android.js b/src/styles/fontWeight/bold/index.android.ts
similarity index 51%
rename from src/styles/fontWeight/bold/index.android.js
rename to src/styles/fontWeight/bold/index.android.ts
index 46e404677d8d..3119e0f391cd 100644
--- a/src/styles/fontWeight/bold/index.android.js
+++ b/src/styles/fontWeight/bold/index.android.ts
@@ -1,3 +1,7 @@
+import FontWeightBoldStyles from './types';
+
 // Android has ExpensifyNeue-Bold, but fontWeight: '700' will result in
 // an incorrect font displaying on Android
-export default '600';
+const bold: FontWeightBoldStyles = '600';
+
+export default bold;
diff --git a/src/styles/fontWeight/bold/index.js b/src/styles/fontWeight/bold/index.js
deleted file mode 100644
index 2444ed19bf9f..000000000000
--- a/src/styles/fontWeight/bold/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Web only has ExpensifyNeue-Regular so to achieve bold we need to add this fontWeight
-export default '700';
diff --git a/src/styles/fontWeight/bold/index.ts b/src/styles/fontWeight/bold/index.ts
new file mode 100644
index 000000000000..45de49abb35b
--- /dev/null
+++ b/src/styles/fontWeight/bold/index.ts
@@ -0,0 +1,6 @@
+import FontWeightBoldStyles from './types';
+
+// Web only has ExpensifyNeue-Regular so to achieve bold we need to add this fontWeight
+const bold: FontWeightBoldStyles = '700';
+
+export default bold;
diff --git a/src/styles/fontWeight/bold/types.ts b/src/styles/fontWeight/bold/types.ts
new file mode 100644
index 000000000000..3c9930a63d87
--- /dev/null
+++ b/src/styles/fontWeight/bold/types.ts
@@ -0,0 +1,6 @@
+import {CSSProperties} from 'react';
+import {TextStyle} from 'react-native';
+
+type FontWeightBoldStyles = (TextStyle | CSSProperties)['fontWeight'];
+
+export default FontWeightBoldStyles;
diff --git a/src/styles/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.js b/src/styles/getTooltipStyles.ts
similarity index 77%
rename from src/styles/getTooltipStyles.js
rename to src/styles/getTooltipStyles.ts
index bc5fcfe807aa..97402467ab4c 100644
--- a/src/styles/getTooltipStyles.js
+++ b/src/styles/getTooltipStyles.ts
@@ -1,35 +1,35 @@
+import {CSSProperties} from 'react';
+import {TextStyle, View, ViewStyle} from 'react-native';
 import spacing from './utilities/spacing';
 import styles from './styles';
-import colors from './colors';
 import themeColors from './themes/default';
 import fontFamily from './fontFamily';
 import variables from './variables';
 import roundToNearestMultipleOfFour from './roundToNearestMultipleOfFour';
 
-// This defines the proximity with the edge of the window in which tooltips should not be displayed.
-// If a tooltip is too close to the edge of the screen, we'll shift it towards the center.
+/** This defines the proximity with the edge of the window in which tooltips should not be displayed.
+ * If a tooltip is too close to the edge of the screen, we'll shift it towards the center. */
 const GUTTER_WIDTH = variables.gutterWidth;
 
-// The height of a tooltip pointer
+/** The height of a tooltip pointer */
 const POINTER_HEIGHT = 4;
 
-// The width of a tooltip pointer
+/** The width of a tooltip pointer */
 const POINTER_WIDTH = 12;
 
 /**
  * Compute the amount the tooltip needs to be horizontally shifted in order to keep it from displaying in the gutters.
  *
- * @param {Number} windowWidth - The width of the window.
- * @param {Number} xOffset - The distance between the left edge of the window
+ * @param windowWidth - The width of the window.
+ * @param xOffset - The distance between the left edge of the window
  *                           and the left edge of the wrapped component.
- * @param {Number} componentWidth - The width of the wrapped component.
- * @param {Number} tooltipWidth - The width of the tooltip itself.
- * @param {Number} [manualShiftHorizontal] - Any additional amount to manually shift the tooltip to the left or right.
+ * @param componentWidth - The width of the wrapped component.
+ * @param tooltipWidth - The width of the tooltip itself.
+ * @param [manualShiftHorizontal] - Any additional amount to manually shift the tooltip to the left or right.
  *                                         A positive value shifts it to the right,
  *                                         and a negative value shifts it to the left.
- * @returns {Number}
  */
-function computeHorizontalShift(windowWidth, xOffset, componentWidth, tooltipWidth, manualShiftHorizontal) {
+function computeHorizontalShift(windowWidth: number, xOffset: number, componentWidth: number, tooltipWidth: number, manualShiftHorizontal: number): number {
     // First find the left and right edges of the tooltip (by default, it is centered on the component).
     const componentCenter = xOffset + componentWidth / 2 + manualShiftHorizontal;
     const tooltipLeftEdge = componentCenter - tooltipWidth / 2;
@@ -61,16 +61,15 @@ function computeHorizontalShift(windowWidth, xOffset, componentWidth, tooltipWid
  *                       |         |
  *                       |_ _ _ _ _|
  *
- * @param {Number} xOffset - The distance between the left edge of the window
+ * @param tooltip - The reference to the tooltip's root element
+ * @param xOffset - The distance between the left edge of the window
  *                           and the left edge of the wrapped component.
- * @param {Number} yOffset - The distance between the top edge of the window
+ * @param yOffset - The distance between the top edge of the window
  *                           and the top edge of the wrapped component.
- * @param {Element} [tooltip] - The reference to the tooltip's root element
- * @param {Number} tooltipTargetWidth - The width of the tooltip's target
- * @param {Number} tooltipTargetHeight - The height of the tooltip's target
- * @returns {Boolean}
+ * @param tooltipTargetWidth - The width of the tooltip's target
+ * @param tooltipTargetHeight - The height of the tooltip's target
  */
-function isOverlappingAtTop(xOffset, yOffset, tooltip, tooltipTargetWidth, tooltipTargetHeight) {
+function isOverlappingAtTop(tooltip: View | HTMLDivElement, xOffset: number, yOffset: number, tooltipTargetWidth: number, tooltipTargetHeight: number) {
     if (typeof document.elementFromPoint !== 'function') {
         return false;
     }
@@ -79,10 +78,9 @@ function isOverlappingAtTop(xOffset, yOffset, tooltip, tooltipTargetWidth, toolt
     // in case the target has a border radius or is a multiline text.
     const targetCenterX = xOffset + tooltipTargetWidth / 2;
     const elementAtTargetCenterX = document.elementFromPoint(targetCenterX, yOffset);
-    const tooltipRef = (tooltip && tooltip.current) || tooltip;
 
     // Ensure it's not the already rendered element of this very tooltip, so the tooltip doesn't try to "avoid" itself
-    if (!elementAtTargetCenterX || (tooltipRef && tooltipRef.contains(elementAtTargetCenterX))) {
+    if (!elementAtTargetCenterX || ('contains' in tooltip && tooltip.contains(elementAtTargetCenterX))) {
         return false;
     }
 
@@ -95,42 +93,49 @@ function isOverlappingAtTop(xOffset, yOffset, tooltip, tooltipTargetWidth, toolt
     return isOverlappingAtTargetCenterX;
 }
 
+type TooltipStyles = {
+    animationStyle: ViewStyle;
+    rootWrapperStyle: ViewStyle | CSSProperties;
+    textStyle: TextStyle;
+    pointerWrapperStyle: ViewStyle | CSSProperties;
+    pointerStyle: ViewStyle;
+};
+
 /**
  * Generate styles for the tooltip component.
  *
- * @param {Number} currentSize - The current size of the tooltip used in the scaling animation.
- * @param {Number} windowWidth - The width of the window.
- * @param {Number} xOffset - The distance between the left edge of the window
+ * @param tooltip - The reference to the tooltip's root element
+ * @param currentSize - The current size of the tooltip used in the scaling animation.
+ * @param windowWidth - The width of the window.
+ * @param xOffset - The distance between the left edge of the window
  *                           and the left edge of the wrapped component.
- * @param {Number} yOffset - The distance between the top edge of the window
+ * @param yOffset - The distance between the top edge of the window
  *                           and the top edge of the wrapped component.
- * @param {Number} tooltipTargetWidth - The width of the tooltip's target
- * @param {Number} tooltipTargetHeight - The height of the tooltip's target
- * @param {Number} maxWidth - The tooltip's max width.
- * @param {Number} tooltipContentWidth - The tooltip's inner content measured width.
- * @param {Number} tooltipWrapperHeight - The tooltip's wrapper measured height.
- * @param {Number} [manualShiftHorizontal] - Any additional amount to manually shift the tooltip to the left or right.
+ * @param tooltipTargetWidth - The width of the tooltip's target
+ * @param tooltipTargetHeight - The height of the tooltip's target
+ * @param maxWidth - The tooltip's max width.
+ * @param tooltipContentWidth - The tooltip's inner content measured width.
+ * @param tooltipWrapperHeight - The tooltip's wrapper measured height.
+ * @param [manualShiftHorizontal] - Any additional amount to manually shift the tooltip to the left or right.
  *                                         A positive value shifts it to the right,
  *                                         and a negative value shifts it to the left.
- * @param {Number} [manualShiftVertical] - Any additional amount to manually shift the tooltip up or down.
+ * @param [manualShiftVertical] - Any additional amount to manually shift the tooltip up or down.
  *                                       A positive value shifts it down, and a negative value shifts it up.
- * @param {Element} tooltip - The reference to the tooltip's root element
- * @returns {Object}
  */
 export default function getTooltipStyles(
-    currentSize,
-    windowWidth,
-    xOffset,
-    yOffset,
-    tooltipTargetWidth,
-    tooltipTargetHeight,
-    maxWidth,
-    tooltipContentWidth,
-    tooltipWrapperHeight,
+    tooltip: View | HTMLDivElement,
+    currentSize: number,
+    windowWidth: number,
+    xOffset: number,
+    yOffset: number,
+    tooltipTargetWidth: number,
+    tooltipTargetHeight: number,
+    maxWidth: number,
+    tooltipContentWidth: number,
+    tooltipWrapperHeight: number,
     manualShiftHorizontal = 0,
     manualShiftVertical = 0,
-    tooltip,
-) {
+): TooltipStyles {
     const tooltipVerticalPadding = spacing.pv1;
 
     // We calculate tooltip width based on the tooltip's content width
@@ -141,7 +146,7 @@ export default function getTooltipStyles(
 
     const isTooltipSizeReady = tooltipWidth !== undefined && tooltipHeight !== undefined;
 
-    // Set the scale to 1 to be able to measure the toolip size correctly when it's not ready yet.
+    // Set the scale to 1 to be able to measure the tooltip size correctly when it's not ready yet.
     let scale = 1;
     let shouldShowBelow = false;
     let horizontalShift = 0;
@@ -157,7 +162,7 @@ export default function getTooltipStyles(
         // If either a tooltip will try to render within GUTTER_WIDTH logical pixels of the top of the screen,
         // Or the wrapped component is overlapping at top-center with another element
         // we'll display it beneath its wrapped component rather than above it as usual.
-        shouldShowBelow = yOffset - tooltipHeight < GUTTER_WIDTH || isOverlappingAtTop(xOffset, yOffset, tooltip, tooltipTargetWidth, tooltipTargetHeight);
+        shouldShowBelow = yOffset - tooltipHeight < GUTTER_WIDTH || isOverlappingAtTop(tooltip, xOffset, yOffset, tooltipTargetWidth, tooltipTargetHeight);
 
         // When the tooltip size is ready, we can start animating the scale.
         scale = currentSize;
@@ -261,13 +266,13 @@ export default function getTooltipStyles(
         pointerStyle: {
             width: 0,
             height: 0,
-            backgroundColor: colors.transparent,
+            backgroundColor: themeColors.transparent,
             borderStyle: 'solid',
             borderLeftWidth: POINTER_WIDTH / 2,
             borderRightWidth: POINTER_WIDTH / 2,
             borderTopWidth: POINTER_HEIGHT,
-            borderLeftColor: colors.transparent,
-            borderRightColor: colors.transparent,
+            borderLeftColor: themeColors.transparent,
+            borderRightColor: themeColors.transparent,
             borderTopColor: themeColors.heading,
             ...pointerAdditionalStyle,
         },
diff --git a/src/styles/styles.js b/src/styles/styles.js
index 1c1340600a51..cef87c531972 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -1,9 +1,8 @@
 import {defaultStyles as defaultPickerStyles} from 'react-native-picker-select/src/styles';
-import {StyleSheet} from 'react-native';
 import lodashClamp from 'lodash/clamp';
 import fontFamily from './fontFamily';
 import addOutlineWidth from './addOutlineWidth';
-import themeColors from './themes/default';
+import defaultTheme from './themes/default';
 import fontWeightBold from './fontWeight/bold';
 import variables from './variables';
 import spacing from './utilities/spacing';
@@ -27,14 +26,15 @@ import * as Browser from '../libs/Browser';
 import cursor from './utilities/cursor';
 import userSelect from './utilities/userSelect';
 import textUnderline from './utilities/textUnderline';
-import Colors from './colors';
 
 // touchCallout is an iOS safari only property that controls the display of the callout information when you touch and hold a target
 const touchCalloutNone = Browser.isMobileSafari() ? {WebkitTouchCallout: 'none'} : {};
+// to prevent vertical text offset in Safari for badges, new lineHeight values have been added
+const lineHeightBadge = Browser.isSafari() ? {lineHeight: variables.lineHeightXSmall} : {lineHeight: variables.lineHeightNormal};
 
-const picker = {
-    backgroundColor: themeColors.transparent,
-    color: themeColors.text,
+const picker = (theme) => ({
+    backgroundColor: theme.transparent,
+    color: theme.text,
     fontFamily: fontFamily.EXP_NEUE,
     fontSize: variables.fontSizeNormal,
     lineHeight: variables.fontSizeNormalHeight,
@@ -45,27 +45,27 @@ const picker = {
     height: variables.inputHeight,
     borderWidth: 0,
     textAlign: 'left',
-};
+});
 
-const link = {
-    color: themeColors.link,
-    textDecorationColor: themeColors.link,
+const link = (theme) => ({
+    color: theme.link,
+    textDecorationColor: theme.link,
     fontFamily: fontFamily.EXP_NEUE,
-};
+});
 
-const baseCodeTagStyles = {
+const baseCodeTagStyles = (theme) => ({
     borderWidth: 1,
     borderRadius: 5,
-    borderColor: themeColors.border,
-    backgroundColor: themeColors.textBackground,
-};
+    borderColor: theme.border,
+    backgroundColor: theme.textBackground,
+});
 
 const headlineFont = {
     fontFamily: fontFamily.EXP_NEW_KANSAS_MEDIUM,
     fontWeight: '500',
 };
 
-const webViewStyles = {
+const webViewStyles = (theme) => ({
     // As of react-native-render-html v6, don't declare distinct styles for
     // custom renderers, the API for custom renderers has changed. Declare the
     // styles in the below "tagStyles" instead. If you need to reuse those
@@ -80,6 +80,7 @@ const webViewStyles = {
         del: {
             textDecorationLine: 'line-through',
             textDecorationStyle: 'solid',
+            flex: 1,
         },
 
         strong: {
@@ -87,7 +88,7 @@ const webViewStyles = {
             fontWeight: 'bold',
         },
 
-        a: link,
+        a: link(theme),
 
         ul: {
             maxWidth: '100%',
@@ -102,7 +103,7 @@ const webViewStyles = {
         },
 
         blockquote: {
-            borderLeftColor: themeColors.border,
+            borderLeftColor: theme.border,
             borderLeftWidth: 4,
             paddingLeft: 12,
             marginTop: 4,
@@ -113,7 +114,7 @@ const webViewStyles = {
         },
 
         pre: {
-            ...baseCodeTagStyles,
+            ...baseCodeTagStyles(theme),
             paddingTop: 12,
             paddingBottom: 12,
             paddingRight: 8,
@@ -124,7 +125,7 @@ const webViewStyles = {
         },
 
         code: {
-            ...baseCodeTagStyles,
+            ...baseCodeTagStyles(theme),
             ...codeStyles.codeTextStyle,
             paddingLeft: 5,
             paddingRight: 5,
@@ -133,7 +134,7 @@ const webViewStyles = {
         },
 
         img: {
-            borderColor: themeColors.border,
+            borderColor: theme.border,
             borderRadius: variables.componentBorderRadiusNormal,
             borderWidth: 1,
             ...touchCalloutNone,
@@ -150,15 +151,16 @@ const webViewStyles = {
     },
 
     baseFontStyle: {
-        color: themeColors.text,
+        color: theme.text,
         fontSize: variables.fontSizeNormal,
         fontFamily: fontFamily.EXP_NEUE,
         flex: 1,
         lineHeight: variables.fontSizeNormalHeight,
+        ...writingDirection.ltr,
     },
-};
+});
 
-const styles = {
+const styles = (theme) => ({
     // Add all of our utility and helper styles
     ...spacing,
     ...sizing,
@@ -171,20 +173,14 @@ const styles = {
     ...writingDirection,
     ...cursor,
     ...userSelect,
-    ...themeColors,
     ...textUnderline,
-
-    rateCol: {
-        margin: 0,
-        padding: 0,
-        flexBasis: '48%',
-    },
+    ...theme, // TODO: Should we do this?
 
     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,54 +224,29 @@ const styles = {
     },
 
     mentionSuggestionsHandle: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
     },
 
-    appIconBorderRadius: {
-        overflow: 'hidden',
-        borderRadius: 12,
-    },
-
-    unitCol: {
-        margin: 0,
-        padding: 0,
-        marginLeft: '4%',
-        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,
-    },
-
-    h1: {
-        color: themeColors.heading,
-        fontFamily: fontFamily.EXP_NEUE_BOLD,
-        fontSize: variables.fontSizeh1,
-        fontWeight: fontWeightBold,
-    },
-
-    h3: {
-        fontFamily: fontFamily.EXP_NEUE_BOLD,
-        fontSize: variables.fontSizeNormal,
-        fontWeight: fontWeightBold,
+        backgroundColor: theme.appBG,
     },
 
     h4: {
@@ -306,13 +277,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 +295,7 @@ const styles = {
     },
 
     textMicroBold: {
-        color: themeColors.text,
+        color: theme.text,
         fontWeight: fontWeightBold,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontSize: variables.fontSizeSmall,
@@ -332,14 +303,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 +354,7 @@ const styles = {
     textHeadline: {
         ...headlineFont,
         ...whiteSpace.preWrap,
-        color: themeColors.heading,
+        color: theme.heading,
         fontSize: variables.fontSizeXLarge,
         lineHeight: variables.lineHeightXXLarge,
     },
@@ -391,7 +362,7 @@ const styles = {
     textHeadlineH1: {
         ...headlineFont,
         ...whiteSpace.preWrap,
-        color: themeColors.heading,
+        color: theme.heading,
         fontSize: variables.fontSizeh1,
         lineHeight: variables.lineHeightSizeh1,
     },
@@ -401,11 +372,11 @@ const styles = {
     },
 
     textWhite: {
-        color: themeColors.textLight,
+        color: theme.textLight,
     },
 
     textBlue: {
-        color: themeColors.link,
+        color: theme.link,
     },
 
     textUppercase: {
@@ -417,19 +388,15 @@ const styles = {
     },
 
     colorReversed: {
-        color: themeColors.textReversed,
+        color: theme.textReversed,
     },
 
     colorMutedReversed: {
-        color: themeColors.textMutedReversed,
+        color: theme.textMutedReversed,
     },
 
     colorMuted: {
-        color: themeColors.textSupporting,
-    },
-
-    colorHeading: {
-        color: themeColors.heading,
+        color: theme.textSupporting,
     },
 
     bgTransparent: {
@@ -437,7 +404,7 @@ const styles = {
     },
 
     bgDark: {
-        backgroundColor: themeColors.inverse,
+        backgroundColor: theme.inverse,
     },
 
     opacity0: {
@@ -449,7 +416,7 @@ const styles = {
     },
 
     textDanger: {
-        color: themeColors.danger,
+        color: theme.danger,
     },
 
     borderRadiusNormal: {
@@ -457,7 +424,7 @@ const styles = {
     },
 
     button: {
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
         borderRadius: variables.buttonBorderRadius,
         minHeight: variables.componentSizeLarge,
         justifyContent: 'center',
@@ -470,7 +437,7 @@ const styles = {
     },
 
     buttonText: {
-        color: themeColors.text,
+        color: theme.text,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontSize: variables.fontSizeNormal,
         fontWeight: fontWeightBold,
@@ -491,7 +458,7 @@ const styles = {
         paddingTop: 4,
         paddingHorizontal: 14,
         paddingBottom: 4,
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
     },
 
     buttonMedium: {
@@ -501,7 +468,7 @@ const styles = {
         paddingRight: 16,
         paddingBottom: 12,
         paddingLeft: 16,
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
     },
 
     buttonLarge: {
@@ -511,7 +478,7 @@ const styles = {
         paddingRight: 10,
         paddingBottom: 8,
         paddingLeft: 18,
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
     },
 
     buttonSmallText: {
@@ -536,12 +503,12 @@ const styles = {
     },
 
     buttonDefaultHovered: {
-        backgroundColor: themeColors.buttonHoveredBG,
+        backgroundColor: theme.buttonHoveredBG,
         borderWidth: 0,
     },
 
     buttonSuccess: {
-        backgroundColor: themeColors.success,
+        backgroundColor: theme.success,
         borderWidth: 0,
     },
 
@@ -550,29 +517,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,23 +584,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,
-    },
-
-    fontWeightBold: {
-        fontWeight: fontWeightBold,
+        backgroundColor: theme.activeComponentBG,
     },
 
     touchableButtonImage: {
@@ -659,7 +622,7 @@ const styles = {
         height: 140,
     },
 
-    pickerSmall: (backgroundColor = themeColors.highlightBG) => ({
+    pickerSmall: (backgroundColor = theme.highlightBG) => ({
         inputIOS: {
             fontFamily: fontFamily.EXP_NEUE,
             fontSize: variables.fontSizeSmall,
@@ -668,23 +631,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 +657,7 @@ const styles = {
             paddingTop: 6,
             paddingBottom: 6,
             borderWidth: 0,
-            color: themeColors.text,
+            color: theme.text,
             appearance: 'none',
             height: 26,
             opacity: 1,
@@ -709,7 +672,7 @@ const styles = {
             paddingTop: 6,
             paddingBottom: 6,
             borderWidth: 0,
-            color: themeColors.text,
+            color: theme.text,
             height: 26,
             opacity: 1,
             backgroundColor: 'transparent',
@@ -725,7 +688,7 @@ const styles = {
     }),
 
     badge: {
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
         borderRadius: 14,
         height: variables.iconSizeNormal,
         flexDirection: 'row',
@@ -734,65 +697,86 @@ const styles = {
     },
 
     badgeSuccess: {
-        backgroundColor: themeColors.success,
+        backgroundColor: theme.success,
     },
 
     badgeSuccessPressed: {
-        backgroundColor: themeColors.successHover,
+        backgroundColor: theme.successHover,
     },
 
     badgeAdHocSuccess: {
-        backgroundColor: themeColors.badgeAdHoc,
+        backgroundColor: theme.badgeAdHoc,
     },
 
     badgeAdHocSuccessPressed: {
-        backgroundColor: themeColors.badgeAdHocHover,
+        backgroundColor: theme.badgeAdHocHover,
     },
 
     badgeDanger: {
-        backgroundColor: themeColors.danger,
+        backgroundColor: theme.danger,
     },
 
     badgeDangerPressed: {
-        backgroundColor: themeColors.dangerPressed,
+        backgroundColor: theme.dangerPressed,
     },
 
     badgeText: {
-        color: themeColors.text,
+        color: theme.text,
         fontSize: variables.fontSizeSmall,
-        lineHeight: variables.lineHeightNormal,
+        ...lineHeightBadge,
         ...whiteSpace.noWrap,
     },
 
     border: {
         borderWidth: 1,
         borderRadius: variables.componentBorderRadius,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     borderColorFocus: {
-        borderColor: themeColors.borderFocus,
+        borderColor: theme.borderFocus,
     },
 
     borderColorDanger: {
-        borderColor: themeColors.danger,
+        borderColor: theme.danger,
+    },
+
+    textInputDisabled: {
+        // Adding disabled color theme to indicate user that the field is not editable.
+        backgroundColor: theme.highlightBG,
+        borderBottomWidth: 2,
+        borderColor: theme.borderLighter,
+        // Adding browser specefic style to bring consistency between Safari and other platforms.
+        // Applying the Webkit styles only to browsers as it is not available in native.
+        ...(Browser.getBrowser()
+            ? {
+                  WebkitTextFillColor: theme.textSupporting,
+                  WebkitOpacity: 1,
+              }
+            : {}),
+        color: theme.textSupporting,
     },
 
     uploadReceiptView: (isSmallScreenWidth) => ({
         borderRadius: variables.componentBorderRadiusLarge,
         borderWidth: isSmallScreenWidth ? 0 : 2,
-        borderColor: themeColors.borderFocus,
+        borderColor: theme.borderFocus,
         borderStyle: 'dotted',
         marginBottom: 20,
         marginLeft: 20,
         marginRight: 20,
         justifyContent: 'center',
         alignItems: 'center',
-        padding: 40,
+        paddingVertical: 40,
         gap: 4,
         flex: 1,
     }),
 
+    receiptViewTextContainer: {
+        paddingHorizontal: 40,
+        ...sizing.w100,
+    },
+
     cameraView: {
         flex: 1,
         overflow: 'hidden',
@@ -800,8 +784,8 @@ const styles = {
         borderRadius: 28,
         borderStyle: 'solid',
         borderWidth: 8,
-        backgroundColor: Colors.greenHighlightBackground,
-        borderColor: Colors.greenAppBackground,
+        backgroundColor: theme.highlightBG,
+        borderColor: theme.appBG,
     },
 
     permissionView: {
@@ -812,14 +796,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,
@@ -829,10 +813,6 @@ const styles = {
         height: CONST.DESKTOP_HEADER_PADDING,
     },
 
-    pushTextRight: {
-        left: 100000,
-    },
-
     reportOptions: {
         marginLeft: 8,
     },
@@ -844,7 +824,7 @@ const styles = {
     },
 
     chatItemComposeSecondaryRowSubText: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeSmall,
         lineHeight: variables.lineHeightSmall,
@@ -861,7 +841,8 @@ const styles = {
     offlineIndicatorMobile: {
         paddingLeft: 20,
         paddingTop: 5,
-        paddingBottom: 5,
+        paddingBottom: 30,
+        marginBottom: -25,
     },
 
     offlineIndicatorRow: {
@@ -905,7 +886,7 @@ const styles = {
     },
 
     calendarDayContainerSelected: {
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
     },
 
     /**
@@ -931,7 +912,7 @@ const styles = {
         height: '100%',
         backgroundColor: 'transparent',
         borderBottomWidth: 2,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         overflow: 'hidden',
     },
 
@@ -940,7 +921,7 @@ const styles = {
         left: 0,
         top: 0,
         fontSize: variables.fontSizeNormal,
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontFamily: fontFamily.EXP_NEUE,
         width: '100%',
     },
@@ -950,7 +931,7 @@ const styles = {
         top: 0,
         width: '100%',
         height: 23,
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
     },
 
     textInputLabelDesktop: {
@@ -965,7 +946,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 +985,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 +1010,7 @@ const styles = {
     },
 
     textInputPrefix: {
-        color: themeColors.text,
+        color: theme.text,
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeNormal,
         textAlignVertical: 'center',
@@ -1039,7 +1020,7 @@ const styles = {
         borderBottomWidth: 2,
         paddingLeft: 0,
         borderStyle: 'solid',
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         justifyContent: 'center',
         backgroundColor: 'transparent',
         height: variables.inputHeight,
@@ -1057,7 +1038,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 +1048,59 @@ 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,
-    },
-
     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 +1108,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 +1130,28 @@ 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,
-        minHeight: '100%',
-        flex: 1,
-        alignItems: 'center',
-    },
-
     signInPage: {
-        backgroundColor: themeColors.highlightBG,
+        backgroundColor: theme.highlightBG,
         minHeight: '100%',
         flex: 1,
     },
@@ -1261,7 +1231,7 @@ const styles = {
 
     // Sidebar Styles
     sidebar: {
-        backgroundColor: themeColors.sidebar,
+        backgroundColor: theme.sidebar,
         height: '100%',
     },
 
@@ -1279,14 +1249,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 +1278,7 @@ const styles = {
     },
 
     floatingActionButton: {
-        backgroundColor: themeColors.success,
+        backgroundColor: theme.success,
         height: variables.componentSizeLarge,
         width: variables.componentSizeLarge,
         borderRadius: 999,
@@ -1317,7 +1287,7 @@ const styles = {
     },
 
     sidebarFooterUsername: {
-        color: themeColors.heading,
+        color: theme.heading,
         fontSize: variables.fontSizeLabel,
         fontWeight: '700',
         width: 200,
@@ -1327,7 +1297,7 @@ const styles = {
     },
 
     sidebarFooterLink: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontSize: variables.fontSizeSmall,
         textDecorationLine: 'none',
         fontFamily: fontFamily.EXP_NEUE,
@@ -1388,7 +1358,7 @@ const styles = {
     createMenuHeaderText: {
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeLabel,
-        color: themeColors.heading,
+        color: theme.heading,
     },
 
     popoverMenuItem: {
@@ -1408,7 +1378,7 @@ const styles = {
 
     popoverMenuText: {
         fontSize: variables.fontSizeNormal,
-        color: themeColors.heading,
+        color: theme.heading,
     },
 
     popoverInnerContainer: {
@@ -1438,28 +1408,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 +1442,7 @@ const styles = {
 
     optionDisplayName: {
         fontFamily: fontFamily.EXP_NEUE,
-        height: variables.alternateTextHeight,
+        minHeight: variables.alternateTextHeight,
         lineHeight: variables.lineHeightXLarge,
         ...whiteSpace.noWrap,
     },
@@ -1509,6 +1479,14 @@ const styles = {
         paddingBottom: 12,
     },
 
+    optionRowSelected: {
+        backgroundColor: theme.activeComponentBG,
+    },
+
+    optionRowDisabled: {
+        color: theme.textSupporting,
+    },
+
     optionRowCompact: {
         height: variables.optionRowHeightCompact,
         paddingTop: 12,
@@ -1520,8 +1498,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.overlay,
         opacity: current.progress.interpolate({
             inputRange: [0, 1],
             outputRange: [0, variables.overlayOpacity],
@@ -1530,7 +1514,7 @@ const styles = {
     }),
 
     appContent: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         overflow: 'hidden',
     },
 
@@ -1559,11 +1543,6 @@ const styles = {
         width: 18,
     },
 
-    chatContent: {
-        flex: 4,
-        justifyContent: 'flex-end',
-    },
-
     chatContentScrollView: {
         flexGrow: 1,
         justifyContent: 'flex-start',
@@ -1603,7 +1582,7 @@ const styles = {
     },
 
     chatItemMessageHeaderSender: {
-        color: themeColors.heading,
+        color: theme.heading,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontSize: variables.fontSizeNormal,
         fontWeight: fontWeightBold,
@@ -1613,13 +1592,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,
@@ -1629,6 +1608,16 @@ const styles = {
         ...wordBreak.breakWord,
     },
 
+    renderHTMLTitle: {
+        color: theme.text,
+        fontSize: variables.fontSizeNormal,
+        fontFamily: fontFamily.EXP_NEUE,
+        lineHeight: variables.lineHeightXLarge,
+        maxWidth: '100%',
+        ...whiteSpace.preWrap,
+        ...wordBreak.breakWord,
+    },
+
     chatItemComposeWithFirstRow: {
         minHeight: 90,
     },
@@ -1638,15 +1627,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 +1650,7 @@ const styles = {
         paddingLeft: 20,
         paddingRight: 20,
         display: 'flex',
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
     },
 
     chatFooterFullCompose: {
@@ -1689,9 +1678,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,
@@ -1718,11 +1707,6 @@ const styles = {
         textAlignVertical: 'top',
     },
 
-    editInputComposeSpacing: {
-        backgroundColor: themeColors.transparent,
-        marginVertical: 8,
-    },
-
     // composer padding should not be modified unless thoroughly tested against the cases in this PR: #12669
     textInputComposeSpacing: {
         paddingVertical: 5,
@@ -1732,13 +1716,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 +1730,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 +1746,7 @@ const styles = {
         ...spacing.pv1,
         fontFamily: fontFamily.EXP_NEUE_BOLD,
         fontWeight: fontWeightBold,
-        color: themeColors.heading,
+        color: theme.heading,
         fontSize: variables.fontSizeSmall,
     },
 
@@ -1782,17 +1766,18 @@ const styles = {
         paddingTop: 2,
         paddingBottom: 2,
         height: CONST.EMOJI_PICKER_ITEM_HEIGHT,
+        ...userSelect.userSelectNone,
     },
 
     emojiItemHighlighted: {
         transition: '0.2s ease',
-        backgroundColor: themeColors.buttonDefaultBG,
+        backgroundColor: theme.buttonDefaultBG,
     },
 
     emojiItemKeyboardHighlighted: {
         transition: '0.2s ease',
         borderWidth: 1,
-        borderColor: themeColors.link,
+        borderColor: theme.link,
         borderRadius: variables.buttonBorderRadius,
     },
 
@@ -1819,7 +1804,7 @@ const styles = {
     },
 
     hoveredButton: {
-        backgroundColor: themeColors.buttonHoveredBG,
+        backgroundColor: theme.buttonHoveredBG,
     },
 
     composerSizeButton: {
@@ -1829,13 +1814,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,
@@ -1844,23 +1829,6 @@ const styles = {
         width: 200,
     },
 
-    chatSwticherPillWrapper: {
-        marginTop: 5,
-        marginRight: 4,
-    },
-
-    navigationModalOverlay: {
-        ...userSelect.userSelectNone,
-        position: 'absolute',
-        width: '100%',
-        height: '100%',
-        transform: [
-            {
-                translateX: -variables.sideBarWidth,
-            },
-        ],
-    },
-
     sidebarVisible: {
         borderRightWidth: 1,
     },
@@ -1873,7 +1841,7 @@ const styles = {
     exampleCheckImage: {
         width: '100%',
         height: 80,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         borderWidth: 1,
         borderRadius: variables.componentBorderRadiusNormal,
     },
@@ -1881,22 +1849,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,
-        borderRadius: 20,
-        zIndex: 1,
-    },
-
     singleAvatarSmall: {
         height: 18,
         width: 18,
-        backgroundColor: themeColors.icon,
+        backgroundColor: theme.icon,
         borderRadius: 18,
     },
 
@@ -1936,24 +1896,13 @@ const styles = {
         right: 0,
     },
 
-    leftSideLargeAvatar: {
-        left: 15,
-    },
-
-    rightSideLargeAvatar: {
-        right: 15,
-        zIndex: 2,
-        borderWidth: 4,
-        borderRadius: 100,
-    },
-
     secondAvatarInline: {
         bottom: -3,
         right: -25,
         borderWidth: 3,
         borderRadius: 18,
-        borderColor: themeColors.cardBorder,
-        backgroundColor: themeColors.appBG,
+        borderColor: theme.cardBorder,
+        backgroundColor: theme.appBG,
     },
 
     avatarLarge: {
@@ -1961,20 +1910,13 @@ const styles = {
         height: variables.avatarSizeLarge,
     },
 
-    avatarNormal: {
-        height: variables.componentSizeNormal,
-        width: variables.componentSizeNormal,
-        borderRadius: variables.componentSizeNormal,
-    },
-
-    avatarSmall: {
-        height: variables.avatarSizeSmall,
-        width: variables.avatarSizeSmall,
-        borderRadius: variables.avatarSizeSmall,
+    avatarXLarge: {
+        width: variables.avatarSizeXLarge,
+        height: variables.avatarSizeXLarge,
     },
 
     avatarInnerText: {
-        color: themeColors.textLight,
+        color: theme.textLight,
         fontSize: variables.fontSizeSmall,
         lineHeight: undefined,
         marginLeft: -3,
@@ -1982,28 +1924,13 @@ const styles = {
     },
 
     avatarInnerTextSmall: {
-        color: themeColors.textLight,
+        color: theme.textLight,
         fontSize: variables.fontSizeExtraSmall,
         lineHeight: undefined,
         marginLeft: -2,
         textAlign: 'center',
     },
 
-    avatarSpace: {
-        top: 3,
-        left: 3,
-    },
-
-    avatar: {
-        backgroundColor: themeColors.sidebar,
-        borderColor: themeColors.sidebar,
-    },
-
-    focusedAvatar: {
-        backgroundColor: themeColors.border,
-        borderColor: themeColors.border,
-    },
-
     emptyAvatar: {
         height: variables.avatarSizeNormal,
         width: variables.avatarSizeNormal,
@@ -2050,33 +1977,28 @@ const styles = {
         marginRight: variables.avatarChatSpacing - 4,
     },
 
-    modalViewContainer: {
-        alignItems: 'center',
-        flex: 1,
-    },
-
     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 +2008,12 @@ const styles = {
 
     borderRight: {
         borderRightWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     borderLeft: {
         borderLeftWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     pointerEventsNone,
@@ -2116,7 +2038,7 @@ const styles = {
 
     imageModalPDF: {
         flex: 1,
-        backgroundColor: themeColors.modalBackground,
+        backgroundColor: theme.modalBackground,
     },
 
     PDFView: {
@@ -2124,7 +2046,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',
@@ -2144,14 +2066,6 @@ const styles = {
         ...(isSmallScreenWidth && flex.flex1),
     }),
 
-    modalCenterContentContainer: {
-        flex: 1,
-        flexDirection: 'column',
-        justifyContent: 'center',
-        alignItems: 'center',
-        backgroundColor: themeColors.modalBackdrop,
-    },
-
     centeredModalStyles: (isSmallScreenWidth, isFullScreenWhenSmall) => ({
         borderWidth: isSmallScreenWidth && !isFullScreenWhenSmall ? 1 : 0,
         marginHorizontal: isSmallScreenWidth ? 0 : 20,
@@ -2165,40 +2079,18 @@ 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',
     },
 
-    notFoundSafeArea: {
-        flex: 1,
-        backgroundColor: themeColors.heading,
-    },
-
-    notFoundView: {
-        flex: 1,
-        alignItems: 'center',
-        paddingTop: 40,
-        paddingBottom: 40,
-        justifyContent: 'space-between',
-    },
-
-    notFoundLogo: {
-        width: 202,
-        height: 63,
-    },
-
-    notFoundContent: {
-        alignItems: 'center',
-    },
-
     notFoundTextHeader: {
         ...headlineFont,
-        color: themeColors.heading,
+        color: theme.heading,
         fontSize: variables.fontSizeXLarge,
         lineHeight: variables.lineHeightXXLarge,
         marginTop: 20,
@@ -2206,27 +2098,13 @@ const styles = {
         textAlign: 'center',
     },
 
-    notFoundTextBody: {
-        color: themeColors.componentBG,
-        fontFamily: fontFamily.EXP_NEUE_BOLD,
-        fontWeight: fontWeightBold,
-        fontSize: 15,
-    },
-
-    notFoundButtonText: {
-        color: themeColors.link,
-        fontFamily: fontFamily.EXP_NEUE_BOLD,
-        fontWeight: fontWeightBold,
-        fontSize: 15,
-    },
-
     blockingViewContainer: {
         paddingBottom: variables.contentHeaderHeight,
     },
 
     defaultModalContainer: {
-        backgroundColor: themeColors.componentBG,
-        borderColor: themeColors.transparent,
+        backgroundColor: theme.componentBG,
+        borderColor: theme.transparent,
     },
 
     reportActionContextMenuMiniButton: {
@@ -2270,20 +2148,8 @@ const styles = {
         justifyContent: 'space-around',
     },
 
-    settingsPageColumn: {
-        width: '100%',
-        alignItems: 'center',
-        justifyContent: 'space-around',
-    },
-
-    settingsPageContainer: {
-        justifyContent: 'space-between',
-        alignItems: 'center',
-        width: '100%',
-    },
-
     twoFactorAuthSection: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         padding: 0,
     },
 
@@ -2301,7 +2167,7 @@ const styles = {
         return {
             alignItems: 'center',
             justifyContent: 'center',
-            backgroundColor: themeColors.highlightBG,
+            backgroundColor: theme.highlightBG,
             paddingVertical: 28,
             borderRadius: 16,
             marginTop: 32,
@@ -2352,7 +2218,7 @@ const styles = {
             justifyContent: 'space-between',
         }),
         padding: 20,
-        backgroundColor: themeColors.sidebar,
+        backgroundColor: theme.sidebar,
         borderRadius: variables.componentBorderRadiusLarge,
         overflow: 'hidden',
     }),
@@ -2372,7 +2238,7 @@ const styles = {
     anonymousRoomFooterLogoTaglineText: {
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeMedium,
-        color: themeColors.textLight,
+        color: theme.textLight,
     },
     signInButtonAvatar: {
         width: 80,
@@ -2388,9 +2254,9 @@ const styles = {
     },
 
     roomHeaderAvatar: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         borderRadius: 100,
-        borderColor: themeColors.componentBG,
+        borderColor: theme.componentBG,
         borderWidth: 4,
     },
 
@@ -2400,7 +2266,7 @@ const styles = {
         right: 0,
         bottom: 0,
         left: 0,
-        backgroundColor: themeColors.overlay,
+        backgroundColor: theme.overlay,
         opacity: variables.overlayOpacity,
         borderRadius: 88,
     },
@@ -2409,7 +2275,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',
@@ -2419,18 +2285,6 @@ const styles = {
         left: -16,
     },
 
-    svgAvatarBorder: {
-        borderRadius: 100,
-        overflow: 'hidden',
-    },
-
-    displayName: {
-        fontSize: variables.fontSizeLarge,
-        fontFamily: fontFamily.EXP_NEUE_BOLD,
-        fontWeight: fontWeightBold,
-        color: themeColors.heading,
-    },
-
     pageWrapper: {
         width: '100%',
         alignItems: 'center',
@@ -2453,12 +2307,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 +2331,7 @@ const styles = {
 
     unreadIndicatorLine: {
         height: 1,
-        backgroundColor: themeColors.unreadIndicator,
+        backgroundColor: theme.unreadIndicator,
         flexGrow: 1,
         marginRight: 8,
         opacity: 0.5,
@@ -2485,13 +2339,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,
@@ -2502,24 +2356,20 @@ const styles = {
         transform: [{rotate: '180deg'}],
     },
 
-    navigationSceneContainer: {
-        backgroundColor: themeColors.appBG,
-    },
-
     navigationScreenCardStyle: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         height: '100%',
     },
 
-    navigationSceneFullScreenWrapper: {
-        borderRadius: variables.componentBorderRadiusCard,
-        overflow: 'hidden',
-        height: '100%',
+    invisible: {
+        position: 'absolute',
+        opacity: 0,
     },
 
-    invisible: {
+    invisiblePopover: {
         position: 'absolute',
         opacity: 0,
+        left: -9999,
     },
 
     containerWithSpaceBetween: {
@@ -2545,6 +2395,13 @@ const styles = {
         position: 'absolute',
     },
 
+    attachmentRevealButtonContainer: {
+        flex: 1,
+        alignItems: 'center',
+        justifyContent: 'center',
+        ...spacing.ph4,
+    },
+
     arrowIcon: {
         height: 40,
         width: 40,
@@ -2554,25 +2411,17 @@ const styles = {
         paddingBottom: 0,
     },
 
-    detailsPageSectionVersion: {
-        alignSelf: 'center',
-        color: themeColors.textSupporting,
-        fontSize: variables.fontSizeSmall,
-        height: 24,
-        lineHeight: 20,
-    },
-
     switchTrack: {
         width: 50,
         height: 28,
         justifyContent: 'center',
         borderRadius: 20,
         padding: 15,
-        backgroundColor: themeColors.success,
+        backgroundColor: theme.success,
     },
 
     switchInactive: {
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
     },
 
     switchThumb: {
@@ -2581,7 +2430,7 @@ const styles = {
         borderRadius: 11,
         position: 'absolute',
         left: 4,
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
     },
 
     switchThumbTransformation: (translateX) => ({
@@ -2589,11 +2438,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 +2456,7 @@ const styles = {
     },
 
     checkedContainer: {
-        backgroundColor: themeColors.checkBox,
+        backgroundColor: theme.checkBox,
     },
 
     magicCodeInputContainer: {
@@ -2618,7 +2467,7 @@ const styles = {
 
     magicCodeInput: {
         fontSize: variables.fontSizeXLarge,
-        color: themeColors.heading,
+        color: theme.heading,
         lineHeight: variables.inputHeight,
     },
 
@@ -2642,7 +2491,7 @@ const styles = {
     iouAmountText: {
         ...headlineFont,
         fontSize: variables.iouAmountTextSize,
-        color: themeColors.heading,
+        color: theme.heading,
         lineHeight: variables.inputHeight,
     },
 
@@ -2650,7 +2499,7 @@ const styles = {
         {
             ...headlineFont,
             fontSize: variables.iouAmountTextSize,
-            color: themeColors.heading,
+            color: theme.heading,
             padding: 0,
             lineHeight: undefined,
         },
@@ -2677,7 +2526,7 @@ const styles = {
     },
 
     moneyRequestPreviewBox: {
-        backgroundColor: themeColors.cardBG,
+        backgroundColor: theme.cardBG,
         borderRadius: variables.componentBorderRadiusLarge,
         maxWidth: variables.sideBarWidth,
         width: '100%',
@@ -2687,6 +2536,10 @@ const styles = {
         padding: 16,
     },
 
+    amountSplitPadding: {
+        paddingTop: 2,
+    },
+
     moneyRequestPreviewBoxLoading: {
         // When a new IOU request arrives it is very briefly in a loading state, so set the minimum height of the container to 94 to match the rendered height after loading.
         // Otherwise, the IOU request pay button will not be fully visible and the user will have to scroll up to reveal the entire IOU request container.
@@ -2703,7 +2556,7 @@ const styles = {
     moneyRequestPreviewAmount: {
         ...headlineFont,
         ...whiteSpace.preWrap,
-        color: themeColors.heading,
+        color: theme.heading,
     },
 
     defaultCheckmarkWrapper: {
@@ -2711,12 +2564,6 @@ const styles = {
         alignSelf: 'center',
     },
 
-    iouDetailsContainer: {
-        flexGrow: 1,
-        paddingStart: 20,
-        paddingEnd: 20,
-    },
-
     codeWordWrapper: {
         ...codeStyles.codeWordWrapper,
     },
@@ -2749,20 +2596,15 @@ const styles = {
     },
 
     fullScreenLoading: {
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
         opacity: 0.8,
         justifyContent: 'center',
         alignItems: 'center',
         zIndex: 10,
     },
 
-    navigatorFullScreenLoading: {
-        backgroundColor: themeColors.highlightBG,
-        opacity: 1,
-    },
-
     reimbursementAccountFullScreenLoading: {
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
         opacity: 0.8,
         justifyContent: 'flex-start',
         alignItems: 'center',
@@ -2810,12 +2652,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 +2666,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,
@@ -2845,47 +2687,13 @@ const styles = {
         height: '100%',
     },
 
-    fullscreenCard: {
-        position: 'absolute',
-        left: 0,
-        top: 0,
-        width: '100%',
-        height: '100%',
-    },
-
-    fullscreenCardWeb: {
-        left: 'auto',
-        right: '-24%',
-        top: '-18%',
-        height: '120%',
-    },
-
-    fullscreenCardWebCentered: {
-        left: '0',
-        right: '0',
-        top: '0',
-        height: '60%',
-    },
-
-    fullscreenCardMobile: {
-        left: '-20%',
-        top: '-30%',
-        width: '150%',
-    },
-
-    fullscreenCardMediumScreen: {
-        left: '-15%',
-        top: '-30%',
-        width: '145%',
-    },
-
     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',
@@ -2897,41 +2705,6 @@ const styles = {
         bottom: -4,
     },
 
-    workspaceCard: {
-        width: '100%',
-        height: 400,
-        borderRadius: variables.componentBorderRadiusCard,
-        overflow: 'hidden',
-        backgroundColor: themeColors.heroCard,
-    },
-
-    workspaceCardMobile: {
-        height: 475,
-    },
-
-    workspaceCardMediumScreen: {
-        height: 540,
-    },
-
-    workspaceCardMainText: {
-        fontSize: variables.fontSizeXXXLarge,
-        fontWeight: 'bold',
-        lineHeight: variables.fontSizeXXXLarge,
-    },
-
-    workspaceCardContent: {
-        zIndex: 1,
-        padding: 50,
-    },
-
-    workspaceCardContentMediumScreen: {
-        padding: 25,
-    },
-
-    workspaceCardCTA: {
-        width: 250,
-    },
-
     autoGrowHeightMultilineInput: {
         maxHeight: 115,
     },
@@ -2945,18 +2718,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 +2755,7 @@ const styles = {
             flex: 1,
         },
         text: {
-            color: themeColors.textSupporting,
+            color: theme.textSupporting,
             textAlignVertical: 'center',
             fontSize: variables.fontSizeLabel,
         },
@@ -3002,7 +2775,7 @@ const styles = {
     },
 
     cardOverlay: {
-        backgroundColor: themeColors.overlay,
+        backgroundColor: theme.overlay,
         position: 'absolute',
         top: 0,
         left: 0,
@@ -3011,26 +2784,20 @@ const styles = {
         opacity: variables.overlayOpacity,
     },
 
-    communicationsLinkIcon: {
-        right: -36,
-        top: 0,
-        bottom: 0,
-    },
-
     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 +2820,7 @@ const styles = {
     shortTermsHeadline: {
         ...headlineFont,
         ...whiteSpace.preWrap,
-        color: themeColors.heading,
+        color: theme.heading,
         fontSize: variables.fontSizeXXXLarge,
         lineHeight: variables.lineHeightXXXLarge,
     },
@@ -3065,7 +2832,7 @@ const styles = {
 
     collapsibleSectionBorder: {
         borderBottomWidth: 2,
-        borderBottomColor: themeColors.border,
+        borderBottomColor: theme.border,
     },
 
     communicationsLinkHeight: {
@@ -3116,11 +2883,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,
@@ -3137,6 +2904,11 @@ const styles = {
         horizontal: windowWidth - 10,
     }),
 
+    threeDotsPopoverOffsetAttachmentModal: (windowWidth) => ({
+        ...getPopOverVerticalOffset(80),
+        horizontal: windowWidth - 140,
+    }),
+
     invert: {
         // It's important to invert the Y AND X axis to prevent a react native issue that can lead to ANRs on android 13
         transform: [{scaleX: -1}, {scaleY: -1}],
@@ -3158,7 +2930,7 @@ const styles = {
     keyboardShortcutTableContainer: {
         display: 'flex',
         width: '100%',
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         height: 'auto',
         borderRadius: variables.componentBorderRadius,
         borderWidth: 1,
@@ -3167,7 +2939,7 @@ const styles = {
     keyboardShortcutTableRow: {
         flex: 1,
         flexDirection: 'row',
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         flexBasis: 'auto',
         alignSelf: 'stretch',
         borderTopWidth: 1,
@@ -3176,7 +2948,7 @@ const styles = {
     keyboardShortcutTablePrefix: {
         width: '30%',
         borderRightWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
     },
 
     keyboardShortcutTableFirstRow: {
@@ -3184,33 +2956,29 @@ 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: {
         fontSize: 48,
     },
 
-    closeAccountMessageInput: {
-        height: 153,
-    },
-
     imageCropContainer: {
         overflow: 'hidden',
         alignItems: 'center',
         justifyContent: 'center',
-        backgroundColor: themeColors.imageCropBackgroundColor,
+        backgroundColor: theme.imageCropBackgroundColor,
         ...cursor.cursorMove,
     },
 
@@ -3221,7 +2989,7 @@ const styles = {
     },
 
     sliderKnob: {
-        backgroundColor: themeColors.success,
+        backgroundColor: theme.success,
         position: 'absolute',
         height: variables.sliderKnobSize,
         width: variables.sliderKnobSize,
@@ -3231,7 +2999,7 @@ const styles = {
     },
 
     sliderBar: {
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
         height: variables.sliderBarHeight,
         borderRadius: variables.sliderBarHeight / 2,
         alignSelf: 'stretch',
@@ -3246,7 +3014,7 @@ const styles = {
     },
 
     inlineSystemMessage: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         fontSize: variables.fontSizeLabel,
         fontFamily: fontFamily.EXP_NEUE,
         marginLeft: 6,
@@ -3261,17 +3029,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 +3049,7 @@ const styles = {
     }),
 
     cardSection: {
-        backgroundColor: themeColors.cardBG,
+        backgroundColor: theme.cardBG,
         borderRadius: variables.componentBorderRadiusCard,
         marginBottom: 20,
         marginHorizontal: 16,
@@ -3302,30 +3070,17 @@ const styles = {
         alignItems: 'center',
     },
 
-    callRequestSection: {
-        backgroundColor: themeColors.appBG,
-        paddingHorizontal: 0,
-        paddingBottom: 0,
-        marginHorizontal: 0,
-        marginBottom: 0,
-    },
-
     archivedReportFooter: {
         borderRadius: variables.componentBorderRadius,
         ...wordBreak.breakWord,
     },
 
-    saveButtonPadding: {
-        paddingLeft: 18,
-        paddingRight: 18,
-    },
-
     deeplinkWrapperContainer: {
         padding: 20,
         flex: 1,
         alignItems: 'center',
         justifyContent: 'center',
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
     },
 
     deeplinkWrapperMessage: {
@@ -3350,7 +3105,7 @@ const styles = {
     emojiReactionListHeader: {
         marginTop: 8,
         paddingBottom: 20,
-        borderBottomColor: themeColors.border,
+        borderBottomColor: theme.border,
         borderBottomWidth: 1,
         marginHorizontal: 20,
     },
@@ -3358,20 +3113,16 @@ const styles = {
         paddingVertical: 2,
         paddingHorizontal: 8,
         borderRadius: 28,
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
         alignItems: 'center',
         justifyContent: 'center',
         flexDirection: 'row',
         alignSelf: 'flex-start',
         marginRight: 4,
     },
-    reactionListItem: {
-        flexDirection: 'row',
-        paddingVertical: 12,
-        paddingHorizontal: 20,
-    },
+
     reactionListHeaderText: {
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         marginLeft: 8,
         alignSelf: 'center',
     },
@@ -3393,7 +3144,7 @@ const styles = {
     },
 
     fontColorReactionLabel: {
-        color: '#586A64',
+        color: theme.tooltipSupportingText,
     },
 
     reactionEmojiTitle: {
@@ -3402,7 +3153,7 @@ const styles = {
     },
 
     textReactionSenders: {
-        color: themeColors.dark,
+        color: theme.tooltipPrimaryText,
         ...wordBreak.breakWord,
     },
 
@@ -3424,7 +3175,7 @@ const styles = {
     },
 
     validateCodeDigits: {
-        color: themeColors.text,
+        color: theme.text,
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeXXLarge,
         letterSpacing: 4,
@@ -3445,14 +3196,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,
     },
 
@@ -3461,18 +3212,13 @@ const styles = {
         width: '100%',
     },
 
-    listPickerSeparator: {
-        height: 1,
-        backgroundColor: themeColors.buttonDefaultBG,
-    },
-
     datePickerRoot: {
         position: 'relative',
         zIndex: 99,
     },
 
     datePickerPopover: {
-        backgroundColor: themeColors.appBG,
+        backgroundColor: theme.appBG,
         width: '100%',
         alignSelf: 'center',
         zIndex: 100,
@@ -3481,7 +3227,7 @@ const styles = {
 
     loginHeroHeader: {
         fontFamily: fontFamily.EXP_NEW_KANSAS_MEDIUM,
-        color: themeColors.success,
+        color: theme.success,
         fontWeight: '500',
         textAlign: 'center',
     },
@@ -3495,14 +3241,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,
     },
 
@@ -3518,15 +3264,6 @@ const styles = {
         width: 16,
     },
 
-    validateCodeMessage: {
-        width: variables.modalContentMaxWidth,
-        textAlign: 'center',
-    },
-
-    whisper: {
-        backgroundColor: themeColors.cardBG,
-    },
-
     contextMenuItemPopoverMaxWidth: {
         maxWidth: 375,
     },
@@ -3559,7 +3296,7 @@ const styles = {
     taskTitleDescription: {
         fontFamily: fontFamily.EXP_NEUE,
         fontSize: variables.fontSizeLabel,
-        color: themeColors.textSupporting,
+        color: theme.textSupporting,
         lineHeight: variables.lineHeightNormal,
         ...spacing.mb1,
     },
@@ -3570,10 +3307,8 @@ const styles = {
     },
 
     reportHorizontalRule: {
-        borderBottomWidth: 1,
-        borderColor: themeColors.border,
+        borderColor: theme.border,
         ...spacing.mh5,
-        ...spacing.mv2,
     },
 
     assigneeTextStyle: {
@@ -3602,13 +3337,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',
     },
@@ -3640,35 +3375,33 @@ const styles = {
     },
 
     loginButtonRow: {
-        justifyContent: 'center',
         width: '100%',
+        gap: 12,
         ...flex.flexRow,
+        ...flex.justifyContentCenter,
     },
 
     loginButtonRowSmallScreen: {
-        justifyContent: 'center',
         width: '100%',
-        marginBottom: 10,
+        gap: 12,
         ...flex.flexRow,
+        ...flex.justifyContentCenter,
+        marginBottom: 10,
     },
 
-    appleButtonContainer: {
+    desktopSignInButtonContainer: {
         width: 40,
         height: 40,
-        marginRight: 20,
     },
 
     signInIconButton: {
-        margin: 10,
-        marginTop: 0,
-        padding: 2,
+        paddingVertical: 2,
     },
 
     googleButtonContainer: {
         colorScheme: 'light',
         width: 40,
         height: 40,
-        marginLeft: 12,
         alignItems: 'center',
         overflow: 'hidden',
     },
@@ -3686,8 +3419,8 @@ const styles = {
     },
 
     tabSelectorButton: {
-        height: 40,
-        padding: 12,
+        height: variables.tabSelectorButtonHeight,
+        padding: variables.tabSelectorButtonPadding,
         flexDirection: 'row',
         alignItems: 'center',
         justifyContent: 'center',
@@ -3704,7 +3437,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,
     }),
 
     /**
@@ -3722,6 +3455,15 @@ const styles = {
         right: 0,
     }),
 
+    dualColorOverscrollSpacer: {
+        position: 'absolute',
+        top: 0,
+        left: 0,
+        width: '100%',
+        height: '100%',
+        zIndex: -1,
+    },
+
     willChangeTransform: {
         willChange: 'transform',
     },
@@ -3745,7 +3487,7 @@ const styles = {
 
     emojiPickerButtonDropdown: {
         justifyContent: 'center',
-        backgroundColor: themeColors.activeComponentBG,
+        backgroundColor: theme.activeComponentBG,
         width: 86,
         height: 52,
         borderRadius: 26,
@@ -3767,15 +3509,19 @@ 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,
+    },
+
+    reportContainerBorderRadius: {
+        borderRadius: variables.componentBorderRadiusLarge,
     },
 
     reportPreviewBoxBody: {
@@ -3785,7 +3531,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 +3551,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 +3572,7 @@ const styles = {
         display: 'flex',
         justifyContent: 'center',
         alignItems: 'center',
-        backgroundColor: themeColors.border,
+        backgroundColor: theme.border,
         marginRight: 12,
     },
 
@@ -3849,7 +3595,7 @@ const styles = {
     sidebarStatusAvatarContainer: {
         height: 44,
         width: 84,
-        backgroundColor: themeColors.componentBG,
+        backgroundColor: theme.componentBG,
         flexDirection: 'row',
         alignItems: 'center',
         justifyContent: 'space-between',
@@ -3869,7 +3615,7 @@ const styles = {
         ...spacing.mv3,
         overflow: 'hidden',
         borderWidth: 2,
-        borderColor: themeColors.cardBG,
+        borderColor: theme.cardBG,
         borderRadius: variables.componentBorderRadiusLarge,
         height: 200,
         maxWidth: 400,
@@ -3895,27 +3641,40 @@ 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,
     },
     userReportStatusEmoji: {
+        flexShrink: 0,
         fontSize: variables.fontSizeNormal,
         marginRight: 4,
     },
@@ -3923,6 +3682,36 @@ const styles = {
         height: 30,
         width: '100%',
     },
-};
 
-export default styles;
+    walletCard: {
+        borderRadius: variables.componentBorderRadiusLarge,
+        position: 'relative',
+        alignSelf: 'center',
+        overflow: 'hidden',
+    },
+
+    walletCardNumber: {
+        color: theme.text,
+        fontSize: variables.fontSizeNormal,
+    },
+
+    walletCardHolder: {
+        position: 'absolute',
+        left: 16,
+        bottom: 16,
+        width: variables.cardNameWidth,
+        color: theme.text,
+        fontSize: variables.fontSizeSmall,
+        lineHeight: variables.lineHeightLarge,
+    },
+});
+
+// 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 defaultStyles;
+export {stylesGenerator};
diff --git a/src/styles/themes/default.js b/src/styles/themes/default.js
index 111b01a3385a..75db4be30e2b 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.darkBorders,
+    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,72 +76,24 @@ 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)',
+    loungeAccessOverlay: colors.blue800,
+    mapAttributionText: colors.black,
 };
 
 darkTheme.PAGE_BACKGROUND_COLORS = {
     [SCREENS.HOME]: darkTheme.sidebar,
+    [SCREENS.SAVE_THE_WORLD.ROOT]: colors.tangerine800,
     [SCREENS.SETTINGS.PREFERENCES]: colors.blue500,
     [SCREENS.SETTINGS.WORKSPACES]: colors.pink800,
-    [ROUTES.I_KNOW_A_TEACHER]: colors.orange800,
-};
-
-const oldTheme = {
-    shadow: colors.black,
-    link: colors.blue,
-    linkHover: colors.blueHover,
-    componentBG: colors.white,
-    hoverComponentBG: colors.gray1,
-    activeComponentBG: colors.gray2,
-    appBG: colors.white,
-    heading: colors.dark,
-    sidebar: colors.gray1,
-    sidebarHover: colors.white,
-    border: colors.gray2,
-    borderFocus: colors.blue,
-    icon: colors.gray3,
-    iconMenu: colors.gray3,
-    iconHovered: colors.dark,
-    iconSuccessFill: colors.green,
-    iconReversed: colors.white,
-    textSupporting: colors.gray4,
-    text: colors.dark,
-    textError: colors.oldRed,
-    textBackground: colors.gray1,
-    textReversed: colors.white,
-    textMutedReversed: colors.gray3,
-    buttonDefaultBG: colors.gray2,
-    offline: colors.gray3,
-    modalBackdrop: colors.gray3,
-    modalBackground: colors.gray2,
-    buttonDisabledBG: colors.gray2,
-    buttonHoveredBG: colors.gray1,
-    buttonPressedBG: colors.gray2,
-    spinner: colors.gray4,
-    unreadIndicator: colors.green,
-    placeholderText: colors.gray3,
-    heroCard: colors.blue,
-    uploadPreviewActivityIndicator: colors.gray1,
-    dropUIBG: 'rgba(6,27,9,0.92)',
-    cardBG: colors.gray1,
-    cardBorder: colors.gray1,
-    checkBox: colors.blue,
-    overlay: colors.gray1,
-
-    // Merging new Keys for Dark Mode merge. Delete after new branding is implemented.
-    highlightBG: colors.gray1,
-    danger: colors.oldRed,
-    dangerHover: colors.oldRedHover,
-    dangerPressed: colors.oldRedHover,
-    dangerDisabled: colors.oldRedDisabled,
-    warning: colors.yellow,
-    success: colors.green,
-    successHover: colors.greenHover,
-    successPressed: colors.greenPressed,
-    transparent: colors.transparent,
-    inverse: colors.dark,
-    textLight: colors.white,
-    textDark: colors.dark,
+    [SCREENS.SETTINGS.SECURITY]: colors.ice500,
+    [SCREENS.SETTINGS.STATUS]: colors.green700,
+    [SCREENS.SETTINGS.ROOT]: darkTheme.sidebar,
 };
 
 export default darkTheme;
diff --git a/src/styles/themes/light.js b/src/styles/themes/light.js
new file mode 100644
index 000000000000..8bc149c5af08
--- /dev/null
+++ b/src/styles/themes/light.js
@@ -0,0 +1,97 @@
+import colors from '../colors';
+import SCREENS from '../../SCREENS';
+
+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.lightBorders,
+    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)',
+    loungeAccessOverlay: colors.blue800,
+    mapAttributionText: colors.black,
+};
+
+lightTheme.PAGE_BACKGROUND_COLORS = {
+    [SCREENS.HOME]: lightTheme.sidebar,
+    [SCREENS.SAVE_THE_WORLD.ROOT]: colors.tangerine800,
+    [SCREENS.SETTINGS.PREFERENCES]: colors.blue500,
+    [SCREENS.SETTINGS.WORKSPACES]: colors.pink800,
+    [SCREENS.SETTINGS.SECURITY]: colors.ice500,
+    [SCREENS.SETTINGS.STATUS]: colors.green700,
+    [SCREENS.SETTINGS.ROOT]: lightTheme.sidebar,
+};
+
+export default lightTheme;
diff --git a/src/styles/themes/useThemePreference.js b/src/styles/themes/useThemePreference.js
index fbb557423f10..579e9dc97c69 100644
--- a/src/styles/themes/useThemePreference.js
+++ b/src/styles/themes/useThemePreference.js
@@ -18,8 +18,11 @@ function useThemePreference() {
         const theme = preferredThemeContext || CONST.THEME.DEFAULT;
 
         // If the user chooses to use the device theme settings, we need to set the theme preference to the system theme
-        if (theme === CONST.THEME.SYSTEM) setThemePreference(systemTheme);
-        else setThemePreference(theme);
+        if (theme === CONST.THEME.SYSTEM) {
+            setThemePreference(systemTheme);
+        } else {
+            setThemePreference(theme);
+        }
     }, [preferredThemeContext, systemTheme]);
 
     return themePreference;
diff --git a/src/styles/useThemeStyles.js b/src/styles/useThemeStyles.ts
similarity index 61%
rename from src/styles/useThemeStyles.js
rename to src/styles/useThemeStyles.ts
index 77ee0edb6f95..a5b3baebbaec 100644
--- a/src/styles/useThemeStyles.js
+++ b/src/styles/useThemeStyles.ts
@@ -8,6 +8,8 @@ function useThemeStyles() {
         throw new Error('StylesContext was null! Are you sure that you wrapped the component under a <ThemeStylesProvider>?');
     }
 
+    // TODO: Remove this "eslint-disable-next" once the theme switching migration is done and styles are fully typed (GH Issue: https://github.com/Expensify/App/issues/27337)
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return themeStyles;
 }
 
diff --git a/src/styles/utilities/display.js b/src/styles/utilities/display.ts
similarity index 81%
rename from src/styles/utilities/display.js
rename to src/styles/utilities/display.ts
index bcef1c6b565f..868c2bdb0e3b 100644
--- a/src/styles/utilities/display.js
+++ b/src/styles/utilities/display.ts
@@ -1,3 +1,6 @@
+import {CSSProperties} from 'react';
+import {ViewStyle} from 'react-native';
+
 /**
  * Display utilities with Bootstrap inspired naming.
  *
@@ -28,4 +31,4 @@ export default {
     dBlock: {
         display: 'block',
     },
-};
+} satisfies Record<string, ViewStyle | CSSProperties>;
diff --git a/src/styles/utilities/overflow.ts b/src/styles/utilities/overflow.ts
index 3961758e40bf..48807283c9b4 100644
--- a/src/styles/utilities/overflow.ts
+++ b/src/styles/utilities/overflow.ts
@@ -1,5 +1,6 @@
 import {CSSProperties} from 'react';
 import overflowAuto from './overflowAuto';
+import overscrollBehaviorContain from './overscrollBehaviorContain';
 
 /**
  * Overflow utility styles with Bootstrap inspired naming.
@@ -23,5 +24,7 @@ export default {
         overscrollBehaviorX: 'none',
     },
 
+    overscrollBehaviorContain,
+
     overflowAuto,
 } satisfies Record<string, CSSProperties>;
diff --git a/src/styles/utilities/overscrollBehaviorContain/index.js b/src/styles/utilities/overscrollBehaviorContain/index.js
new file mode 100644
index 000000000000..1377e4b47d28
--- /dev/null
+++ b/src/styles/utilities/overscrollBehaviorContain/index.js
@@ -0,0 +1,3 @@
+export default {
+    overscrollBehavior: 'contain',
+};
diff --git a/src/libs/ComposerUtils/updateNumberOfLines/index.js b/src/styles/utilities/overscrollBehaviorContain/index.native.js
similarity index 100%
rename from src/libs/ComposerUtils/updateNumberOfLines/index.js
rename to src/styles/utilities/overscrollBehaviorContain/index.native.js
diff --git a/src/styles/utilities/positioning.ts b/src/styles/utilities/positioning.ts
index fc505e4cb608..651d2a12f2ea 100644
--- a/src/styles/utilities/positioning.ts
+++ b/src/styles/utilities/positioning.ts
@@ -47,4 +47,7 @@ export default {
     b0: {
         bottom: 0,
     },
+    b2: {
+        bottom: 8,
+    },
 } satisfies Record<string, ViewStyle>;
diff --git a/src/styles/utilities/spacing.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/styles/variables.ts b/src/styles/variables.ts
index eb182ab1eca0..9ee9b64e6467 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -25,9 +25,10 @@ export default {
     componentBorderRadiusLarge: 16,
     componentBorderRadiusCard: 12,
     componentBorderRadiusRounded: 24,
-    downloadAppModalAppIconSize: 48,
+    appModalAppIconSize: 48,
     buttonBorderRadius: 100,
     avatarSizeLargeBordered: 88,
+    avatarSizeXLarge: 120,
     avatarSizeLarge: 80,
     avatarSizeMedium: 52,
     avatarSizeHeader: 40,
@@ -70,11 +71,12 @@ export default {
     iconSizeXLarge: 28,
     iconSizeExtraLarge: 40,
     iconSizeSuperLarge: 60,
+    iconSizeUltraLarge: 120,
     emojiSize: 20,
     emojiLineHeight: 28,
     iouAmountTextSize: 40,
     extraSmallMobileResponsiveWidthBreakpoint: 320,
-    extraSmallMobileResponsiveHeightBreakpoint: 550,
+    extraSmallMobileResponsiveHeightBreakpoint: 667,
     mobileResponsiveWidthBreakpoint: 800,
     modalFullscreenBackdropOpacity: 0.5,
     tabletResponsiveWidthBreakpoint: 1024,
@@ -87,7 +89,8 @@ export default {
     optionRowHeight: 64,
     optionRowHeightCompact: 52,
     optionsListSectionHeaderHeight: getValueUsingPixelRatio(32, 38),
-    overlayOpacity: 0.6,
+    overlayOpacity: 0.72,
+    lineHeightXSmall: getValueUsingPixelRatio(11, 17),
     lineHeightSmall: getValueUsingPixelRatio(14, 16),
     lineHeightNormal: getValueUsingPixelRatio(16, 21),
     lineHeightLarge: getValueUsingPixelRatio(18, 24),
@@ -133,6 +136,8 @@ export default {
     signInLogoWidth: 120,
     signInLogoWidthLargeScreen: 144,
     signInLogoWidthPill: 132,
+    tabSelectorButtonHeight: 40,
+    tabSelectorButtonPadding: 12,
     lhnLogoWidth: 108,
     lhnLogoHeight: 28,
     signInLogoWidthLargeScreenPill: 162,
@@ -154,4 +159,8 @@ export default {
     moneyRequestSkeletonHeight: 107,
 
     distanceScrollEventThrottle: 16,
+
+    cardPreviewHeight: 148,
+    cardPreviewWidth: 235,
+    cardNameWidth: 156,
 } as const;
diff --git a/src/types/modules/electron.d.ts b/src/types/modules/electron.d.ts
new file mode 100644
index 000000000000..09e33f29ba38
--- /dev/null
+++ b/src/types/modules/electron.d.ts
@@ -0,0 +1,18 @@
+// TODO: Move this type to desktop/contextBridge.js once it is converted to TS
+type ContextBridgeApi = {
+    send: (channel: string, data?: unknown) => void;
+    sendSync: (channel: string, data?: unknown) => unknown;
+    invoke: (channel: string, ...args: unknown) => Promise<unknown>;
+    on: (channel: string, func: () => void) => void;
+    removeAllListeners: (channel: string) => void;
+};
+
+declare global {
+    // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+    interface Window {
+        electron: ContextBridgeApi;
+    }
+}
+
+// We used the export {} line to mark this file as an external module
+export {};
diff --git a/src/types/modules/react-native.d.ts b/src/types/modules/react-native.d.ts
index 1b0b39e5f67d..ebe0974db690 100644
--- a/src/types/modules/react-native.d.ts
+++ b/src/types/modules/react-native.d.ts
@@ -1,9 +1,14 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 import 'react-native';
+import {BootSplashModule} from '../../libs/BootSplash/types';
 
 declare module 'react-native' {
     interface TextInput {
         // Typescript type declaration is missing in React Native for setting text selection.
         setSelection: (start: number, end: number) => void;
     }
+
+    interface NativeModulesStatic {
+        BootSplash: BootSplashModule;
+    }
 }
diff --git a/src/types/onyx/Account.ts b/src/types/onyx/Account.ts
index 29f21d703466..85b0c2359702 100644
--- a/src/types/onyx/Account.ts
+++ b/src/types/onyx/Account.ts
@@ -2,6 +2,8 @@ import {ValueOf} from 'type-fest';
 import CONST from '../../CONST';
 import * as OnyxCommon from './OnyxCommon';
 
+type TwoFactorAuthStep = ValueOf<typeof CONST.TWO_FACTOR_AUTH_STEPS> | '';
+
 type Account = {
     /** URL to the assigned guide's appointment booking calendar */
     guideCalendarLink?: string;
@@ -47,6 +49,9 @@ type Account = {
 
     errors?: OnyxCommon.Errors;
     success?: string;
+    codesAreCopied?: boolean;
+    twoFactorAuthStep?: TwoFactorAuthStep;
 };
 
 export default Account;
+export type {TwoFactorAuthStep};
diff --git a/src/types/onyx/Card.ts b/src/types/onyx/Card.ts
index 1efa5906360e..e7bf417fccc0 100644
--- a/src/types/onyx/Card.ts
+++ b/src/types/onyx/Card.ts
@@ -1,5 +1,6 @@
 import {ValueOf} from 'type-fest';
 import CONST from '../../CONST';
+import * as OnyxCommon from './OnyxCommon';
 
 type State = 3 /* OPEN */ | 4 /* NOT_ACTIVATED */ | 5 /* STATE_DEACTIVATED */ | 6 /* CLOSED */ | 7 /* STATE_SUSPENDED */;
 
@@ -9,11 +10,14 @@ type Card = {
     bank: string;
     availableSpend: number;
     domainName: string;
-    maskedPan: string;
+    maskedPan?: string; // do not reference, removing as part of Expensify/App#27943
+    lastFourPAN?: string;
+    cardName: string;
     isVirtual: boolean;
     fraud: ValueOf<typeof CONST.EXPENSIFY_CARD.FRAUD_TYPES>;
     cardholderFirstName: string;
     cardholderLastName: string;
+    errors?: OnyxCommon.Errors;
 };
 
 export default Card;
diff --git a/src/types/onyx/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/OnyxCommon.ts b/src/types/onyx/OnyxCommon.ts
index 36e9c6ae74ea..db82edcb98ff 100644
--- a/src/types/onyx/OnyxCommon.ts
+++ b/src/types/onyx/OnyxCommon.ts
@@ -4,7 +4,7 @@ import CONST from '../../CONST';
 
 type PendingAction = ValueOf<typeof CONST.RED_BRICK_ROAD_PENDING_ACTION>;
 
-type ErrorFields = Record<string | number, Record<string, string>>;
+type ErrorFields = Record<string | number, Record<string, string> | null>;
 
 type Errors = Record<string, string>;
 
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/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts
index 8ed25cb286b0..369ff44773ab 100644
--- a/src/types/onyx/OriginalMessage.ts
+++ b/src/types/onyx/OriginalMessage.ts
@@ -137,4 +137,4 @@ type OriginalMessage =
     | OriginalMessagePolicyTask;
 
 export default OriginalMessage;
-export type {Reaction};
+export type {Reaction, ChronosOOOEvent};
diff --git a/src/types/onyx/Paypal.ts b/src/types/onyx/Paypal.ts
deleted file mode 100644
index 26236a63b7fc..000000000000
--- a/src/types/onyx/Paypal.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import CONST from '../../CONST';
-import * as OnyxCommon from './OnyxCommon';
-
-type PaypalAccountData = {
-    username: string;
-};
-
-type Paypal = {
-    /** This is always 'PayPal.me' */
-    title: string;
-
-    /** The paypalMe address */
-    description: string;
-
-    /** This is always 'payPalMe' */
-    methodID: typeof CONST.PAYMENT_METHODS.PAYPAL;
-
-    /** This is always 'payPalMe' */
-    accountType: typeof CONST.PAYMENT_METHODS.PAYPAL;
-
-    key: string;
-    isDefault: boolean;
-    pendingAction?: OnyxCommon.PendingAction;
-    accountData: PaypalAccountData;
-};
-
-export default Paypal;
diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index cacbb5d15199..df4a1364a894 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -4,22 +4,22 @@ import * as OnyxCommon from './OnyxCommon';
 
 type Policy = {
     /** The ID of the policy */
-    id?: string;
+    id: string;
 
     /** The name of the policy */
-    name?: string;
+    name: string;
 
     /** The current user's role in the policy */
-    role?: ValueOf<typeof CONST.POLICY.ROLE>;
+    role: ValueOf<typeof CONST.POLICY.ROLE>;
 
     /** The policy type */
-    type?: ValueOf<typeof CONST.POLICY.TYPE>;
+    type: ValueOf<typeof CONST.POLICY.TYPE>;
 
     /** The email of the policy owner */
-    owner?: string;
+    owner: string;
 
     /** The output currency for the policy */
-    outputCurrency?: string;
+    outputCurrency: string;
 
     /** The URL for the policy avatar */
     avatar?: string;
@@ -27,11 +27,26 @@ type Policy = {
     /** Error objects keyed by field name containing errors keyed by microtime */
     errorFields?: OnyxCommon.ErrorFields;
 
+    /** Indicates the type of change made to the policy that hasn't been synced with the server yet  */
     pendingAction?: OnyxCommon.PendingAction;
+
+    /** A list of errors keyed by microtime */
     errors: OnyxCommon.Errors;
+
+    /** Whether this policy was loaded from a policy summary, or loaded completely with all of its values */
     isFromFullPolicy?: boolean;
+
+    /** When this policy was last modified */
     lastModified?: string;
+
+    /** The custom units data for this policy */
     customUnits?: Record<string, unknown>;
+
+    /** Whether chat rooms can be created and used on this policy. Enabled manually by CQ/JS snippet. Always true for free policies. */
+    areChatRoomsEnabled: boolean;
+
+    /** Whether policy expense chats can be created and used on this policy. Enabled manually by CQ/JS snippet. Always true for free policies. */
+    isPolicyExpenseChatEnabled: boolean;
 };
 
 export default Policy;
diff --git a/src/types/onyx/PolicyCategory.ts b/src/types/onyx/PolicyCategory.ts
new file mode 100644
index 000000000000..adaf16e1acec
--- /dev/null
+++ b/src/types/onyx/PolicyCategory.ts
@@ -0,0 +1,22 @@
+type PolicyCategory = {
+    /** Name of a category */
+    name: string;
+
+    /** Flag that determines if a category is active and able to be selected */
+    enabled: boolean;
+
+    /** If true, not adding a comment to a transaction with this category will trigger a violation */
+    areCommentsRequired: boolean;
+
+    /** "General Ledger code" that corresponds to this category in an accounting system. Similar to an ID. */
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    'GL Code': string;
+
+    /** An ID for this category from an external accounting system */
+    externalID: string;
+
+    /** The external accounting service that this category comes from */
+    origin: string;
+};
+
+export default PolicyCategory;
diff --git a/src/types/onyx/PolicyTag.ts b/src/types/onyx/PolicyTag.ts
new file mode 100644
index 000000000000..fe6bee3a1f31
--- /dev/null
+++ b/src/types/onyx/PolicyTag.ts
@@ -0,0 +1,13 @@
+type PolicyTag = {
+    /** Name of a Tag */
+    name: string;
+
+    /** Flag that determines if a tag is active and able to be selected */
+    enabled: boolean;
+
+    /** "General Ledger code" that corresponds to this tag in an accounting system. Similar to an ID. */
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    'GL Code': string;
+};
+
+export default PolicyTag;
diff --git a/src/types/onyx/QueuedOnyxUpdates.ts b/src/types/onyx/QueuedOnyxUpdates.ts
deleted file mode 100644
index 40daa2e09335..000000000000
--- a/src/types/onyx/QueuedOnyxUpdates.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import Onyx from 'react-native-onyx';
-
-type QueuedOnyxUpdates = Array<typeof Onyx.update>;
-
-export default QueuedOnyxUpdates;
diff --git a/src/types/onyx/ReceiptModal.ts b/src/types/onyx/ReceiptModal.ts
deleted file mode 100644
index 0d52f684b4d2..000000000000
--- a/src/types/onyx/ReceiptModal.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-type ReceiptModal = {
-    isAttachmentInvalid: boolean;
-    attachmentInvalidReasonTitle: string;
-    attachmentInvalidReason: string;
-};
-
-export default ReceiptModal;
diff --git a/src/types/onyx/RecentWaypoints.ts b/src/types/onyx/RecentWaypoint.ts
similarity index 76%
rename from src/types/onyx/RecentWaypoints.ts
rename to src/types/onyx/RecentWaypoint.ts
index 75780ef861e5..79aded8ede98 100644
--- a/src/types/onyx/RecentWaypoints.ts
+++ b/src/types/onyx/RecentWaypoint.ts
@@ -1,4 +1,4 @@
-type RecentWaypoints = {
+type RecentWaypoint = {
     /** The full address of the waypoint */
     address: string;
 
@@ -9,4 +9,4 @@ type RecentWaypoints = {
     lng: number;
 };
 
-export default RecentWaypoints;
+export default RecentWaypoint;
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/Report.ts b/src/types/onyx/Report.ts
index 8660837ba874..46e51fe41238 100644
--- a/src/types/onyx/Report.ts
+++ b/src/types/onyx/Report.ts
@@ -12,12 +12,6 @@ type Report = {
     /** List of icons for report participants */
     icons?: OnyxCommon.Icon[];
 
-    /** Are we loading more report actions? */
-    isLoadingMoreReportActions?: boolean;
-
-    /** Flag to check if the report actions data are loading */
-    isLoadingReportActions?: boolean;
-
     /** Whether the user is not an admin of policyExpenseChat chat */
     isOwnPolicyExpenseChat?: boolean;
 
@@ -81,6 +75,8 @@ type Report = {
     lastActorAccountID?: number;
     ownerAccountID?: number;
     participantAccountIDs?: number[];
+    total?: number;
+    currency?: string;
 };
 
 export default Report;
diff --git a/src/types/onyx/ReportAction.ts b/src/types/onyx/ReportAction.ts
index 5f0072959917..ec505a7e8d07 100644
--- a/src/types/onyx/ReportAction.ts
+++ b/src/types/onyx/ReportAction.ts
@@ -46,6 +46,9 @@ type ReportActionBase = {
     /** The ID of the reportAction. It is the string representation of the a 64-bit integer. */
     reportActionID?: string;
 
+    /** The ID of the previous reportAction on the report. It is a string represenation of a 64-bit integer (or null for CREATED actions). */
+    previousReportActionID?: string;
+
     actorAccountID?: number;
 
     /** Person who created the action */
diff --git a/src/types/onyx/ReportMetadata.ts b/src/types/onyx/ReportMetadata.ts
new file mode 100644
index 000000000000..3e389c8cff4f
--- /dev/null
+++ b/src/types/onyx/ReportMetadata.ts
@@ -0,0 +1,9 @@
+type ReportMetadata = {
+    /** Are we loading more report actions? */
+    isLoadingMoreReportActions?: boolean;
+
+    /** Flag to check if the report actions data are loading */
+    isLoadingReportActions?: boolean;
+};
+
+export default ReportMetadata;
diff --git a/src/types/onyx/Request.ts b/src/types/onyx/Request.ts
index 1df20cfb28fe..94f14af0ddb3 100644
--- a/src/types/onyx/Request.ts
+++ b/src/types/onyx/Request.ts
@@ -1,7 +1,7 @@
 import {OnyxUpdate} from 'react-native-onyx';
 
 type Request = {
-    command?: string;
+    command: string;
     data?: Record<string, unknown>;
     type?: string;
     shouldUseSecure?: boolean;
diff --git a/src/types/onyx/Response.ts b/src/types/onyx/Response.ts
index c501034e971c..255ac6d9bae4 100644
--- a/src/types/onyx/Response.ts
+++ b/src/types/onyx/Response.ts
@@ -3,9 +3,10 @@ import {OnyxUpdate} from 'react-native-onyx';
 type Response = {
     previousUpdateID?: number | string;
     lastUpdateID?: number | string;
-    jsonCode?: number;
+    jsonCode?: number | string;
     onyxData?: OnyxUpdate[];
     requestID?: string;
+    message?: string;
 };
 
 export default Response;
diff --git a/src/types/onyx/Transaction.ts b/src/types/onyx/Transaction.ts
index 4326920ab51f..dd53024a5426 100644
--- a/src/types/onyx/Transaction.ts
+++ b/src/types/onyx/Transaction.ts
@@ -1,43 +1,57 @@
 import {ValueOf} from 'type-fest';
 import * as OnyxCommon from './OnyxCommon';
 import CONST from '../../CONST';
+import RecentWaypoint from './RecentWaypoint';
 
+type WaypointCollection = Record<string, RecentWaypoint | null>;
 type Comment = {
     comment?: string;
+    waypoints?: WaypointCollection;
 };
 
+type GeometryType = 'LineString';
+
 type Geometry = {
-    coordinates: number[][];
-    type: 'LineString';
+    coordinates: number[][] | null;
+    type?: GeometryType;
 };
 
 type Route = {
-    distance: number;
+    distance: number | null;
     geometry: Geometry;
 };
 
 type Routes = Record<string, Route>;
 
 type Transaction = {
-    transactionID: string;
     amount: number;
-    category?: string;
-    currency: string;
-    reportID: string;
+    billable: boolean;
+    category: string;
     comment: Comment;
-    merchant: string;
     created: string;
-    pendingAction: OnyxCommon.PendingAction;
+    currency: string;
     errors: OnyxCommon.Errors;
+    errorFields?: OnyxCommon.ErrorFields;
+    // The name of the file used for a receipt (formerly receiptFilename)
+    filename?: string;
+    merchant: string;
     modifiedAmount?: number;
     modifiedCreated?: string;
     modifiedCurrency?: string;
+    pendingAction: OnyxCommon.PendingAction;
+    pendingFields: {
+        comment: string;
+    };
     receipt: {
         receiptID?: number;
         source?: string;
         state?: ValueOf<typeof CONST.IOU.RECEIPT_STATE>;
     };
+    reportID: string;
     routes?: Routes;
+    transactionID: string;
+    tag: string;
 };
 
 export default Transaction;
+export type {WaypointCollection};
diff --git a/src/types/onyx/UserWallet.ts b/src/types/onyx/UserWallet.ts
index 8624f16000c9..c6ab5dbf1f67 100644
--- a/src/types/onyx/UserWallet.ts
+++ b/src/types/onyx/UserWallet.ts
@@ -34,6 +34,9 @@ type UserWallet = {
     /** The type of the linked account (debitCard or bankAccount) */
     walletLinkedAccountType: WalletLinkedAccountType;
 
+    /** The wallet's programID, used to show the correct terms. */
+    walletProgramID?: string;
+
     /** The user's bank account ID */
     bankAccountID?: number;
 
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index d908c0b36ce1..e50925e7adf2 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -1,7 +1,6 @@
 import Account from './Account';
 import Request from './Request';
 import Credentials from './Credentials';
-import QueuedOnyxUpdates from './QueuedOnyxUpdates';
 import IOU from './IOU';
 import Modal from './Modal';
 import Network from './Network';
@@ -15,7 +14,6 @@ import User from './User';
 import Login from './Login';
 import Session from './Session';
 import Beta from './Beta';
-import Paypal from './Paypal';
 import BlockedFromConcierge from './BlockedFromConcierge';
 import PlaidData from './PlaidData';
 import UserWallet from './UserWallet';
@@ -31,26 +29,28 @@ import FrequentlyUsedEmoji from './FrequentlyUsedEmoji';
 import ReimbursementAccount from './ReimbursementAccount';
 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 ReportMetadata from './ReportMetadata';
 import ReportAction from './ReportAction';
 import ReportActionReactions from './ReportActionReactions';
 import SecurityGroup from './SecurityGroup';
 import Transaction from './Transaction';
 import Form, {AddDebitCardForm} from './Form';
-import RecentWaypoints from './RecentWaypoints';
+import RecentWaypoint from './RecentWaypoint';
 import RecentlyUsedCategories from './RecentlyUsedCategories';
+import RecentlyUsedTags from './RecentlyUsedTags';
+import PolicyTag from './PolicyTag';
 
 export type {
     Account,
     Request,
     Credentials,
-    QueuedOnyxUpdates,
     IOU,
     Modal,
     Network,
@@ -64,7 +64,6 @@ export type {
     Login,
     Session,
     Beta,
-    Paypal,
     BlockedFromConcierge,
     PlaidData,
     UserWallet,
@@ -80,12 +79,13 @@ export type {
     ReimbursementAccountDraft,
     FrequentlyUsedEmoji,
     WalletTransfer,
-    ReceiptModal,
     MapboxAccessToken,
     Download,
     PolicyMember,
     Policy,
+    PolicyCategory,
     Report,
+    ReportMetadata,
     ReportAction,
     ReportActionReactions,
     SecurityGroup,
@@ -93,6 +93,9 @@ export type {
     Form,
     AddDebitCardForm,
     OnyxUpdatesFromServer,
-    RecentWaypoints,
+    RecentWaypoint,
+    OnyxUpdateEvent,
     RecentlyUsedCategories,
+    RecentlyUsedTags,
+    PolicyTag,
 };
diff --git a/tests/README.md b/tests/README.md
index 4ac21499c0f4..dd5b5fc1635f 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -6,7 +6,7 @@
 
 - Much of the logic in the app is asynchronous in nature. [`react-native-onyx`](https://github.com/expensify/react-native-onyx) relies on [`AsyncStorage`](https://github.com/react-native-async-storage/async-storage) and writes data async before updating subscribers.
 - [Actions](https://github.com/Expensify/App#actions) do not typically return a `Promise` and therefore can't always be "awaited" before running an assertion.
-- To test a result after some asynchronous code has run we can use [`Onyx.connect()`](https://github.com/Expensify/react-native-onyx/blob/2c94a94e51fab20330f7bd5381b72ea6c25553d9/lib/Onyx.js#L217-L231) and the helper method [`waitForPromisesToResolve()`](https://github.com/Expensify/ReactNativeChat/blob/ca2fa88a5789b82463d35eddc3d57f70a7286868/tests/utils/waitForPromisesToResolve.js#L1-L9) which returns a `Promise` and will ensure that all other `Promises` have finished running before resolving.
+- To test a result after some asynchronous code has run we can use [`Onyx.connect()`](https://github.com/Expensify/react-native-onyx/blob/2c94a94e51fab20330f7bd5381b72ea6c25553d9/lib/Onyx.js#L217-L231) and the helper method [`waitForBatchedUpdates()`](https://github.com/Expensify/ReactNativeChat/blob/ca2fa88a5789b82463d35eddc3d57f70a7286868/tests/utils/waitForBatchedUpdates.js#L1-L9) which returns a `Promise` and will ensure that all other `Promises` have finished running before resolving.
 - **Important Note:** When writing any asynchronous Jest test it's very important that your test itself **return a `Promise`**.
 
 ## Mocking Network Requests
@@ -65,7 +65,7 @@ describe('actions/Report', () => {
 
         // When we add a new action to that report
         Report.addComment(REPORT_ID, 'Hello!');
-        return waitForPromisesToResolve()
+        return waitForBatchedUpdates()
             .then(() => {
                 const action = reportActions[ACTION_ID];
 
diff --git a/tests/actions/IOUTest.js b/tests/actions/IOUTest.js
index afb06cdb6fb3..3df3b137bab3 100644
--- a/tests/actions/IOUTest.js
+++ b/tests/actions/IOUTest.js
@@ -2,7 +2,7 @@ import _ from 'underscore';
 import Onyx from 'react-native-onyx';
 import CONST from '../../src/CONST';
 import ONYXKEYS from '../../src/ONYXKEYS';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import * as IOU from '../../src/libs/actions/IOU';
 import * as TestHelper from '../utils/TestHelper';
 import DateUtils from '../../src/libs/DateUtils';
@@ -10,6 +10,20 @@ import * as NumberUtils from '../../src/libs/NumberUtils';
 import * as ReportActions from '../../src/libs/actions/ReportActions';
 import * as Report from '../../src/libs/actions/Report';
 import OnyxUpdateManager from '../../src/libs/actions/OnyxUpdateManager';
+import waitForNetworkPromises from '../utils/waitForNetworkPromises';
+import * as ReportUtils from '../../src/libs/ReportUtils';
+import * as ReportActionsUtils from '../../src/libs/ReportActionsUtils';
+import * as PersonalDetailsUtils from '../../src/libs/PersonalDetailsUtils';
+import * as User from '../../src/libs/actions/User';
+import PusherHelper from '../utils/PusherHelper';
+import Navigation from '../../src/libs/Navigation/Navigation';
+import ROUTES from '../../src/ROUTES';
+
+jest.mock('../../src/libs/Navigation/Navigation', () => ({
+    navigate: jest.fn(),
+    dismissModal: jest.fn(),
+    goBack: jest.fn(),
+}));
 
 const CARLOS_EMAIL = 'cmartins@expensifail.com';
 const CARLOS_ACCOUNT_ID = 1;
@@ -30,7 +44,7 @@ describe('actions/IOU', () => {
 
     beforeEach(() => {
         global.fetch = TestHelper.getGlobalFetchMock();
-        return Onyx.clear().then(waitForPromisesToResolve);
+        return Onyx.clear().then(waitForBatchedUpdates);
     });
 
     describe('requestMoney', () => {
@@ -44,7 +58,7 @@ describe('actions/IOU', () => {
             let transactionID;
             fetch.pause();
             IOU.requestMoney({}, amount, CONST.CURRENCY.USD, '', merchant, RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment);
-            return waitForPromisesToResolve()
+            return waitForBatchedUpdates()
                 .then(
                     () =>
                         new Promise((resolve) => {
@@ -209,7 +223,7 @@ describe('actions/IOU', () => {
                 )
                 .then(() => {
                     IOU.requestMoney(chatReport, amount, CONST.CURRENCY.USD, '', '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment);
-                    return waitForPromisesToResolve();
+                    return waitForBatchedUpdates();
                 })
                 .then(
                     () =>
@@ -309,6 +323,7 @@ describe('actions/IOU', () => {
                         }),
                 )
                 .then(fetch.resume)
+                .then(waitForBatchedUpdates)
                 .then(
                     () =>
                         new Promise((resolve) => {
@@ -400,7 +415,7 @@ describe('actions/IOU', () => {
                 .then(() => Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${existingTransaction.transactionID}`, existingTransaction))
                 .then(() => {
                     IOU.requestMoney(chatReport, amount, CONST.CURRENCY.USD, '', '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment);
-                    return waitForPromisesToResolve();
+                    return waitForBatchedUpdates();
                 })
                 .then(
                     () =>
@@ -491,6 +506,7 @@ describe('actions/IOU', () => {
                         }),
                 )
                 .then(fetch.resume)
+                .then(waitForNetworkPromises)
                 .then(
                     () =>
                         new Promise((resolve) => {
@@ -533,7 +549,7 @@ describe('actions/IOU', () => {
             fetch.pause();
             IOU.requestMoney({}, amount, CONST.CURRENCY.USD, '', '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment);
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     .then(
                         () =>
                             new Promise((resolve) => {
@@ -904,7 +920,7 @@ describe('actions/IOU', () => {
                         comment,
                         CONST.CURRENCY.USD,
                     );
-                    return waitForPromisesToResolve();
+                    return waitForBatchedUpdates();
                 })
                 .then(
                     () =>
@@ -1127,6 +1143,7 @@ describe('actions/IOU', () => {
                         }),
                 )
                 .then(fetch.resume)
+                .then(waitForNetworkPromises)
                 .then(
                     () =>
                         new Promise((resolve) => {
@@ -1187,7 +1204,7 @@ describe('actions/IOU', () => {
             let payIOUAction;
             let transaction;
             IOU.requestMoney({}, amount, CONST.CURRENCY.USD, '', '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment);
-            return waitForPromisesToResolve()
+            return waitForBatchedUpdates()
                 .then(
                     () =>
                         new Promise((resolve) => {
@@ -1267,7 +1284,7 @@ describe('actions/IOU', () => {
                 .then(() => {
                     fetch.pause();
                     IOU.payMoneyRequest(CONST.IOU.PAYMENT_TYPE.ELSEWHERE, chatReport, iouReport);
-                    return waitForPromisesToResolve();
+                    return waitForBatchedUpdates();
                 })
                 .then(
                     () =>
@@ -1372,4 +1389,773 @@ describe('actions/IOU', () => {
                 );
         });
     });
+
+    describe('deleteMoneyRequest', () => {
+        const amount = 10000;
+        const comment = 'Send me money please';
+        let chatReport;
+        let iouReport;
+        let createIOUAction;
+        let transaction;
+        let thread;
+        const TEST_USER_ACCOUNT_ID = 1;
+        const TEST_USER_LOGIN = 'test@test.com';
+        let IOU_REPORT_ID;
+        let reportActionID;
+        const REPORT_ACTION = {
+            actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
+            actorAccountID: TEST_USER_ACCOUNT_ID,
+            automatic: false,
+            avatar: 'https://d2k5nsl2zxldvw.cloudfront.net/images/avatars/avatar_3.png',
+            message: [{type: 'COMMENT', html: 'Testing a comment', text: 'Testing a comment', translationKey: ''}],
+            person: [{type: 'TEXT', style: 'strong', text: 'Test User'}],
+            shouldShow: true,
+        };
+
+        let reportActions;
+
+        beforeEach(async () => {
+            // Given mocks are cleared and helpers are set up
+            jest.clearAllMocks();
+            PusherHelper.setup();
+
+            // Given a test user is signed in with Onyx setup and some initial data
+            await TestHelper.signInWithTestUser(TEST_USER_ACCOUNT_ID, TEST_USER_LOGIN);
+            User.subscribeToUserEvents();
+            await waitForBatchedUpdates();
+            await TestHelper.setPersonalDetails(TEST_USER_LOGIN, TEST_USER_ACCOUNT_ID);
+
+            // When an IOU request for money is made
+            IOU.requestMoney({}, amount, CONST.CURRENCY.USD, '', '', TEST_USER_LOGIN, TEST_USER_ACCOUNT_ID, {login: RORY_EMAIL, accountID: RORY_ACCOUNT_ID}, comment);
+            await waitForBatchedUpdates();
+
+            // When fetching all reports from Onyx
+            const allReports = await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.REPORT,
+                    waitForCollectionCallback: true,
+                    callback: (reports) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(reports);
+                    },
+                });
+            });
+
+            // Then we should have exactly 2 reports
+            expect(_.size(allReports)).toBe(2);
+
+            // Then one of them should be a chat report with relevant properties
+            chatReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.CHAT);
+            expect(chatReport).toBeTruthy();
+            expect(chatReport).toHaveProperty('reportID');
+            expect(chatReport).toHaveProperty('iouReportID');
+            expect(chatReport.hasOutstandingIOU).toBe(true);
+
+            // Then one of them should be an IOU report with relevant properties
+            iouReport = _.find(allReports, (report) => report.type === CONST.REPORT.TYPE.IOU);
+            expect(iouReport).toBeTruthy();
+            expect(iouReport).toHaveProperty('reportID');
+            expect(iouReport).toHaveProperty('chatReportID');
+
+            // Then their IDs should reference each other
+            expect(chatReport.iouReportID).toBe(iouReport.reportID);
+            expect(iouReport.chatReportID).toBe(chatReport.reportID);
+
+            // Storing IOU Report ID for further reference
+            IOU_REPORT_ID = chatReport.iouReportID;
+
+            await waitForBatchedUpdates();
+
+            // When fetching all report actions from Onyx
+            const allReportActions = await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                    waitForCollectionCallback: true,
+                    callback: (actions) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(actions);
+                    },
+                });
+            });
+
+            // Then we should find an IOU action with specific properties
+            const reportActionsForIOUReport = allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.iouReportID}`];
+            createIOUAction = _.find(reportActionsForIOUReport, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
+            expect(createIOUAction).toBeTruthy();
+            expect(createIOUAction.originalMessage.IOUReportID).toBe(iouReport.reportID);
+
+            // When fetching all transactions from Onyx
+            const allTransactions = await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.TRANSACTION,
+                    waitForCollectionCallback: true,
+                    callback: (transactions) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(transactions);
+                    },
+                });
+            });
+
+            // Then we should find a specific transaction with relevant properties
+            transaction = _.find(allTransactions, (t) => t);
+            expect(transaction).toBeTruthy();
+            expect(transaction.amount).toBe(amount);
+            expect(transaction.reportID).toBe(iouReport.reportID);
+            expect(createIOUAction.originalMessage.IOUTransactionID).toBe(transaction.transactionID);
+        });
+
+        afterEach(PusherHelper.teardown);
+
+        it('delete a money request (IOU Action and transaction) successfully', async () => {
+            // Given the fetch operations are paused and a money request is initiated
+            fetch.pause();
+
+            // When the money request is deleted
+            IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, true);
+            await waitForBatchedUpdates();
+
+            // Then we check if the IOU report action is removed from the report actions collection
+            let reportActionsForReport = await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
+                    waitForCollectionCallback: true,
+                    callback: (actionsForReport) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(actionsForReport);
+                    },
+                });
+            });
+
+            createIOUAction = _.find(reportActionsForReport, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
+            expect(createIOUAction).toBeFalsy();
+
+            // Then we check if the transaction is removed from the transactions collection
+            const t = await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`,
+                    waitForCollectionCallback: true,
+                    callback: (transactionResult) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(transactionResult);
+                    },
+                });
+            });
+
+            expect(t).toBeFalsy();
+
+            // Given fetch operations are resumed
+            fetch.resume();
+
+            // Then we recheck the IOU report action from the report actions collection
+            reportActionsForReport = await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
+                    waitForCollectionCallback: true,
+                    callback: (actionsForReport) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(actionsForReport);
+                    },
+                });
+            });
+
+            createIOUAction = _.find(reportActionsForReport, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
+            expect(createIOUAction).toBeFalsy();
+
+            // Then we recheck the transaction from the transactions collection
+            const tr = await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`,
+                    waitForCollectionCallback: true,
+                    callback: (transactionResult) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(transactionResult);
+                    },
+                });
+            });
+
+            expect(tr).toBeFalsy();
+        });
+
+        it('delete the IOU report when there are no visible comments left in the IOU report', async () => {
+            // Given an IOU report and a paused fetch state
+            fetch.pause();
+
+            // When the IOU money request is deleted
+            IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, true);
+            await waitForBatchedUpdates();
+
+            let report = await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+                    waitForCollectionCallback: true,
+                    callback: (res) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(res);
+                    },
+                });
+            });
+
+            // Then the report should be falsy (indicating deletion)
+            expect(report).toBeFalsy();
+
+            // Given the resumed fetch state
+            fetch.resume();
+
+            report = await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+                    waitForCollectionCallback: true,
+                    callback: (res) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(res);
+                    },
+                });
+            });
+
+            // Then the report should still be falsy (confirming deletion persisted)
+            expect(report).toBeFalsy();
+        });
+
+        it('does not delete the IOU report when there are visible comments left in the IOU report', async () => {
+            // Given the initial setup is completed
+            await waitForBatchedUpdates();
+
+            Onyx.connect({
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${IOU_REPORT_ID}`,
+                callback: (val) => (reportActions = val),
+            });
+            await waitForBatchedUpdates();
+
+            jest.advanceTimersByTime(10);
+
+            // When a comment is added to the IOU report
+            Report.addComment(IOU_REPORT_ID, 'Testing a comment');
+            await waitForBatchedUpdates();
+
+            // Then verify that the comment is correctly added
+            const resultAction = _.find(reportActions, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT);
+            reportActionID = resultAction.reportActionID;
+
+            expect(resultAction.message).toEqual(REPORT_ACTION.message);
+            expect(resultAction.person).toEqual(REPORT_ACTION.person);
+            expect(resultAction.pendingAction).toBeNull();
+
+            await waitForBatchedUpdates();
+
+            // Verify there are three actions (created + iou + addcomment) and our optimistic comment has been removed
+            expect(_.size(reportActions)).toBe(3);
+
+            // Then check the loading state of our action
+            const resultActionAfterUpdate = reportActions[reportActionID];
+            expect(resultActionAfterUpdate.pendingAction).toBeNull();
+
+            // When we attempt to delete a money request from the IOU report
+            fetch.pause();
+            IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
+            await waitForBatchedUpdates();
+
+            // Then expect that the IOU report still exists
+            let allReports = await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.REPORT,
+                    waitForCollectionCallback: true,
+                    callback: (reports) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(reports);
+                    },
+                });
+            });
+
+            await waitForBatchedUpdates();
+
+            iouReport = _.find(allReports, (report) => ReportUtils.isIOUReport(report));
+            expect(iouReport).toBeTruthy();
+            expect(iouReport).toHaveProperty('reportID');
+            expect(iouReport).toHaveProperty('chatReportID');
+
+            // Given the resumed fetch state
+            fetch.resume();
+
+            allReports = await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.REPORT,
+                    waitForCollectionCallback: true,
+                    callback: (reports) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(reports);
+                    },
+                });
+            });
+            // Then expect that the IOU report still exists
+            iouReport = _.find(allReports, (report) => ReportUtils.isIOUReport(report));
+            expect(iouReport).toBeTruthy();
+            expect(iouReport).toHaveProperty('reportID');
+            expect(iouReport).toHaveProperty('chatReportID');
+        });
+
+        it('delete the transaction thread if there are no visible comments in the thread', async () => {
+            // Given all promises are resolved
+            await waitForBatchedUpdates();
+            jest.advanceTimersByTime(10);
+
+            // Given a transaction thread
+            thread = ReportUtils.buildTransactionThread(createIOUAction, IOU_REPORT_ID);
+
+            Onyx.connect({
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
+                callback: (val) => (reportActions = val),
+            });
+
+            await waitForBatchedUpdates();
+
+            jest.advanceTimersByTime(10);
+
+            // Given User logins from the participant accounts
+            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread.participantAccountIDs);
+
+            // When Opening a thread report with the given details
+            Report.openReport(thread.reportID, userLogins, thread, createIOUAction.reportActionID);
+            await waitForBatchedUpdates();
+
+            // Then The iou action has the transaction report id as a child report ID
+            const allReportActions = await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                    waitForCollectionCallback: true,
+                    callback: (actions) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(actions);
+                    },
+                });
+            });
+            const reportActionsForIOUReport = allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.iouReportID}`];
+            createIOUAction = _.find(reportActionsForIOUReport, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
+            expect(createIOUAction.childReportID).toBe(thread.reportID);
+
+            await waitForBatchedUpdates();
+
+            // Given Fetch is paused and timers have advanced
+            fetch.pause();
+            jest.advanceTimersByTime(10);
+
+            // When Deleting a money request
+            IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
+            await waitForBatchedUpdates();
+
+            // Then The report for the given thread ID does not exist
+            let report = await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
+                    waitForCollectionCallback: true,
+                    callback: (reportData) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(reportData);
+                    },
+                });
+            });
+
+            expect(report).toBeFalsy();
+            fetch.resume();
+
+            // Then After resuming fetch, the report for the given thread ID still does not exist
+            report = await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
+                    waitForCollectionCallback: true,
+                    callback: (reportData) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(reportData);
+                    },
+                });
+            });
+
+            expect(report).toBeFalsy();
+        });
+
+        it('does not delete the transaction thread if there are visible comments in the thread', async () => {
+            // Given initial environment is set up
+            await waitForBatchedUpdates();
+
+            // Given a transaction thread
+            thread = ReportUtils.buildTransactionThread(createIOUAction);
+            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread.participantAccountIDs);
+            jest.advanceTimersByTime(10);
+            Report.openReport(thread.reportID, userLogins, thread, createIOUAction.reportActionID);
+            await waitForBatchedUpdates();
+
+            Onyx.connect({
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
+                callback: (val) => (reportActions = val),
+            });
+            await waitForBatchedUpdates();
+
+            await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
+                    waitForCollectionCallback: true,
+                    callback: (report) => {
+                        Onyx.disconnect(connectionID);
+                        expect(report).toBeTruthy();
+                        resolve();
+                    },
+                });
+            });
+
+            jest.advanceTimersByTime(10);
+
+            // When a comment is added
+            Report.addComment(thread.reportID, 'Testing a comment');
+            await waitForBatchedUpdates();
+
+            // Then comment details should match the expected report action
+            const resultAction = _.find(reportActions, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT);
+            reportActionID = resultAction.reportActionID;
+            expect(resultAction.message).toEqual(REPORT_ACTION.message);
+            expect(resultAction.person).toEqual(REPORT_ACTION.person);
+
+            await waitForBatchedUpdates();
+
+            // Then the report should have 2 actions
+            expect(_.size(reportActions)).toBe(2);
+            const resultActionAfter = reportActions[reportActionID];
+            expect(resultActionAfter.pendingAction).toBeNull();
+
+            fetch.pause();
+            // When deleting money request
+            IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
+            await waitForBatchedUpdates();
+
+            // Then the transaction thread report should still exist
+            await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
+                    waitForCollectionCallback: true,
+                    callback: (report) => {
+                        Onyx.disconnect(connectionID);
+                        expect(report).toBeTruthy();
+                        resolve();
+                    },
+                });
+            });
+
+            // When fetch resumes
+            // Then the transaction thread report should still exist
+            fetch.resume();
+            await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
+                    waitForCollectionCallback: true,
+                    callback: (report) => {
+                        Onyx.disconnect(connectionID);
+                        expect(report).toBeTruthy();
+                        resolve();
+                    },
+                });
+            });
+        });
+
+        it('update the moneyRequestPreview to show [Deleted request] when appropriate', async () => {
+            await waitForBatchedUpdates();
+
+            // Given a thread report
+
+            jest.advanceTimersByTime(10);
+            thread = ReportUtils.buildTransactionThread(createIOUAction, IOU_REPORT_ID);
+
+            Onyx.connect({
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
+                callback: (val) => (reportActions = val),
+            });
+            await waitForBatchedUpdates();
+
+            jest.advanceTimersByTime(10);
+            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread.participantAccountIDs);
+            Report.openReport(thread.reportID, userLogins, thread, createIOUAction.reportActionID);
+
+            await waitForBatchedUpdates();
+
+            const allReportActions = await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                    waitForCollectionCallback: true,
+                    callback: (actions) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(actions);
+                    },
+                });
+            });
+
+            const reportActionsForIOUReport = allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.iouReportID}`];
+            createIOUAction = _.find(reportActionsForIOUReport, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
+            expect(createIOUAction.childReportID).toBe(thread.reportID);
+
+            await waitForBatchedUpdates();
+
+            // Given an added comment to the thread report
+
+            jest.advanceTimersByTime(10);
+
+            Report.addComment(thread.reportID, 'Testing a comment');
+            await waitForBatchedUpdates();
+
+            let resultAction = _.find(reportActions, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT);
+            reportActionID = resultAction.reportActionID;
+
+            expect(resultAction.message).toEqual(REPORT_ACTION.message);
+            expect(resultAction.person).toEqual(REPORT_ACTION.person);
+            expect(resultAction.pendingAction).toBeNull();
+
+            await waitForBatchedUpdates();
+
+            // Verify there are three actions (created + addcomment) and our optimistic comment has been removed
+            expect(_.size(reportActions)).toBe(2);
+
+            let resultActionAfterUpdate = reportActions[reportActionID];
+
+            // Verify that our action is no longer in the loading state
+            expect(resultActionAfterUpdate.pendingAction).toBeNull();
+
+            await waitForBatchedUpdates();
+
+            // Given an added comment to the IOU report
+
+            Onyx.connect({
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${IOU_REPORT_ID}`,
+                callback: (val) => (reportActions = val),
+            });
+            await waitForBatchedUpdates();
+
+            jest.advanceTimersByTime(10);
+
+            Report.addComment(IOU_REPORT_ID, 'Testing a comment');
+            await waitForBatchedUpdates();
+
+            resultAction = _.find(reportActions, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT);
+            reportActionID = resultAction.reportActionID;
+
+            expect(resultAction.message).toEqual(REPORT_ACTION.message);
+            expect(resultAction.person).toEqual(REPORT_ACTION.person);
+            expect(resultAction.pendingAction).toBeNull();
+
+            await waitForBatchedUpdates();
+
+            // Verify there are three actions (created + iou + addcomment) and our optimistic comment has been removed
+            expect(_.size(reportActions)).toBe(3);
+
+            resultActionAfterUpdate = reportActions[reportActionID];
+
+            // Verify that our action is no longer in the loading state
+            expect(resultActionAfterUpdate.pendingAction).toBeNull();
+
+            fetch.pause();
+            // When we delete the money request
+            IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
+            await waitForBatchedUpdates();
+
+            // Then we expect the moneyRequestPreview to show [Deleted request]
+
+            await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
+                    waitForCollectionCallback: true,
+                    callback: (reportActionsForReport) => {
+                        Onyx.disconnect(connectionID);
+                        createIOUAction = _.find(reportActionsForReport, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
+                        expect(createIOUAction.message[0].isDeletedParentAction).toBeTruthy();
+                        resolve();
+                    },
+                });
+            });
+
+            // When we resume fetch
+
+            fetch.resume();
+
+            // Then we expect the moneyRequestPreview to show [Deleted request]
+
+            await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
+                    waitForCollectionCallback: true,
+                    callback: (reportActionsForReport) => {
+                        Onyx.disconnect(connectionID);
+                        createIOUAction = _.find(reportActionsForReport, (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
+                        expect(createIOUAction.message[0].isDeletedParentAction).toBeTruthy();
+                        resolve();
+                    },
+                });
+            });
+        });
+
+        it('update IOU report and reportPreview with new totals and messages if the IOU report is not deleted', async () => {
+            await waitForBatchedUpdates();
+            Onyx.connect({
+                key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
+                callback: (val) => (iouReport = val),
+            });
+            await waitForBatchedUpdates();
+
+            // Given a second money request in addition to the first one
+
+            jest.advanceTimersByTime(10);
+            const amount2 = 20000;
+            const comment2 = 'Send me money please 2';
+            IOU.requestMoney(chatReport, amount2, CONST.CURRENCY.USD, '', '', TEST_USER_LOGIN, TEST_USER_ACCOUNT_ID, {login: RORY_EMAIL, accountID: RORY_ACCOUNT_ID}, comment2);
+
+            await waitForBatchedUpdates();
+
+            // Then we expect the IOU report and reportPreview to update with new totals
+
+            expect(iouReport).toBeTruthy();
+            expect(iouReport).toHaveProperty('reportID');
+            expect(iouReport).toHaveProperty('chatReportID');
+            expect(iouReport.hasOutstandingIOU).toBeTruthy();
+            expect(iouReport.total).toBe(30000);
+
+            const ioupreview = ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID);
+            expect(ioupreview).toBeTruthy();
+            expect(ioupreview.message[0].text).toBe('rory@expensifail.com owes $300.00');
+
+            // When we delete the first money request
+            fetch.pause();
+            jest.advanceTimersByTime(10);
+            IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
+            await waitForBatchedUpdates();
+
+            // Then we expect the IOU report and reportPreview to update with new totals
+
+            expect(iouReport).toBeTruthy();
+            expect(iouReport).toHaveProperty('reportID');
+            expect(iouReport).toHaveProperty('chatReportID');
+            expect(iouReport.hasOutstandingIOU).toBeTruthy();
+            expect(iouReport.total).toBe(20000);
+
+            // When we resume fetch
+            fetch.resume();
+
+            // Then we expect the IOU report and reportPreview to update with new totals
+            expect(iouReport).toBeTruthy();
+            expect(iouReport).toHaveProperty('reportID');
+            expect(iouReport).toHaveProperty('chatReportID');
+            expect(iouReport.hasOutstandingIOU).toBeTruthy();
+            expect(iouReport.total).toBe(20000);
+        });
+
+        it('navigate the user correctly to the iou Report when appropriate', async () => {
+            await waitForBatchedUpdates();
+
+            Onyx.connect({
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${IOU_REPORT_ID}`,
+                callback: (val) => (reportActions = val),
+            });
+            await waitForBatchedUpdates();
+
+            // Given an added comment to the iou report
+
+            jest.advanceTimersByTime(10);
+
+            Report.addComment(IOU_REPORT_ID, 'Testing a comment');
+            await waitForBatchedUpdates();
+
+            const resultAction = _.find(reportActions, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT);
+            reportActionID = resultAction.reportActionID;
+
+            expect(resultAction.message).toEqual(REPORT_ACTION.message);
+            expect(resultAction.person).toEqual(REPORT_ACTION.person);
+
+            await waitForBatchedUpdates();
+
+            // Verify there are three actions (created + iou + addcomment) and our optimistic comment has been removed
+            expect(_.size(reportActions)).toBe(3);
+
+            await waitForBatchedUpdates();
+
+            // Given a thread report
+
+            jest.advanceTimersByTime(10);
+            thread = ReportUtils.buildTransactionThread(createIOUAction, IOU_REPORT_ID);
+
+            Onyx.connect({
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
+                callback: (val) => (reportActions = val),
+            });
+            await waitForBatchedUpdates();
+
+            jest.advanceTimersByTime(10);
+            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread.participantAccountIDs);
+            Report.openReport(thread.reportID, userLogins, thread, createIOUAction.reportActionID);
+            await waitForBatchedUpdates();
+
+            const allReportActions = await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                    waitForCollectionCallback: true,
+                    callback: (actions) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(actions);
+                    },
+                });
+            });
+
+            const reportActionsForIOUReport = allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.iouReportID}`];
+            createIOUAction = _.find(reportActionsForIOUReport, (ra) => ra.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
+            expect(createIOUAction.childReportID).toBe(thread.reportID);
+
+            await waitForBatchedUpdates();
+
+            // When we delete the money request in SingleTransactionView and we should not delete the IOU report
+
+            fetch.pause();
+
+            IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, true);
+            await waitForBatchedUpdates();
+
+            let allReports = await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.REPORT,
+                    waitForCollectionCallback: true,
+                    callback: (reports) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(reports);
+                    },
+                });
+            });
+
+            await waitForBatchedUpdates();
+
+            iouReport = _.find(allReports, (report) => ReportUtils.isIOUReport(report));
+            expect(iouReport).toBeTruthy();
+            expect(iouReport).toHaveProperty('reportID');
+            expect(iouReport).toHaveProperty('chatReportID');
+
+            fetch.resume();
+
+            allReports = await new Promise((resolve) => {
+                const connectionID = Onyx.connect({
+                    key: ONYXKEYS.COLLECTION.REPORT,
+                    waitForCollectionCallback: true,
+                    callback: (reports) => {
+                        Onyx.disconnect(connectionID);
+                        resolve(reports);
+                    },
+                });
+            });
+
+            iouReport = _.find(allReports, (report) => ReportUtils.isIOUReport(report));
+            expect(iouReport).toBeTruthy();
+            expect(iouReport).toHaveProperty('reportID');
+            expect(iouReport).toHaveProperty('chatReportID');
+
+            // Then we expect to navigate to the iou report
+
+            expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(IOU_REPORT_ID));
+        });
+
+        it('navigate the user correctly to the chat Report when appropriate', () => {
+            // When we delete the money request and we should delete the IOU report
+            IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
+            // Then we expect to navigate to the chat report
+            expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(chatReport.reportID));
+        });
+    });
 });
diff --git a/tests/actions/ReportTest.js b/tests/actions/ReportTest.js
index 978186fcf9c4..06d8304111cb 100644
--- a/tests/actions/ReportTest.js
+++ b/tests/actions/ReportTest.js
@@ -6,7 +6,7 @@ import {beforeEach, beforeAll, afterEach, describe, it, expect} from '@jest/glob
 import ONYXKEYS from '../../src/ONYXKEYS';
 import CONST from '../../src/CONST';
 import * as Report from '../../src/libs/actions/Report';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import PusherHelper from '../utils/PusherHelper';
 import * as TestHelper from '../utils/TestHelper';
 import Log from '../../src/libs/Log';
@@ -14,7 +14,10 @@ import * as PersistedRequests from '../../src/libs/actions/PersistedRequests';
 import * as User from '../../src/libs/actions/User';
 import * as ReportUtils from '../../src/libs/ReportUtils';
 import DateUtils from '../../src/libs/DateUtils';
+import * as SequentialQueue from '../../src/libs/Network/SequentialQueue';
 import OnyxUpdateManager from '../../src/libs/actions/OnyxUpdateManager';
+import waitForNetworkPromises from '../utils/waitForNetworkPromises';
+import getIsUsingFakeTimers from '../utils/getIsUsingFakeTimers';
 
 jest.mock('../../src/libs/actions/Report', () => {
     const originalModule = jest.requireActual('../../src/libs/actions/Report');
@@ -35,7 +38,15 @@ describe('actions/Report', () => {
         });
     });
 
-    beforeEach(() => Onyx.clear().then(waitForPromisesToResolve));
+    beforeEach(() => {
+        const promise = Onyx.clear().then(jest.useRealTimers);
+        if (getIsUsingFakeTimers()) {
+            // flushing pending timers
+            // Onyx.clear() promise is resolved in batch which happends after the current microtasks cycle
+            setImmediate(jest.runOnlyPendingTimers);
+        }
+        return promise;
+    });
 
     afterEach(PusherHelper.teardown);
 
@@ -66,14 +77,14 @@ describe('actions/Report', () => {
         return TestHelper.signInWithTestUser(TEST_USER_ACCOUNT_ID, TEST_USER_LOGIN)
             .then(() => {
                 User.subscribeToUserEvents();
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => TestHelper.setPersonalDetails(TEST_USER_LOGIN, TEST_USER_ACCOUNT_ID))
             .then(() => {
                 // This is a fire and forget response, but once it completes we should be able to verify that we
                 // have an "optimistic" report action in Onyx.
                 Report.addComment(REPORT_ID, 'Testing a comment');
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 const resultAction = _.first(_.values(reportActions));
@@ -109,7 +120,7 @@ describe('actions/Report', () => {
                 // Once a reportComment event is emitted to the Pusher channel we should see the comment get processed
                 // by the Pusher callback and added to the storage so we must wait for promises to resolve again and
                 // then verify the data is in Onyx.
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // Verify there is only one action and our optimistic comment has been removed
@@ -137,7 +148,7 @@ describe('actions/Report', () => {
         return TestHelper.signInWithTestUser(TEST_USER_ACCOUNT_ID, TEST_USER_LOGIN)
             .then(() => {
                 Report.togglePinnedState(REPORT_ID, false);
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // Test that Onyx immediately updated the report pin state.
@@ -169,7 +180,7 @@ describe('actions/Report', () => {
                 expect(PersistedRequests.getAll().length).toBe(1);
 
                 // When we wait for the queue to run
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // THEN only ONE call to AddComment will happen
@@ -180,6 +191,8 @@ describe('actions/Report', () => {
     });
 
     it('should be updated correctly when new comments are added, deleted or marked as unread', () => {
+        jest.useFakeTimers();
+        global.fetch = TestHelper.getGlobalFetchMock();
         const REPORT_ID = '1';
         let report;
         let reportActionCreatedDate;
@@ -198,12 +211,13 @@ describe('actions/Report', () => {
         const USER_1_LOGIN = 'user@test.com';
         const USER_1_ACCOUNT_ID = 1;
         const USER_2_ACCOUNT_ID = 2;
-        return Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportName: 'Test', reportID: REPORT_ID})
+        const setPromise = Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {reportName: 'Test', reportID: REPORT_ID})
             .then(() => TestHelper.signInWithTestUser(USER_1_ACCOUNT_ID, USER_1_LOGIN))
+            .then(waitForNetworkPromises)
             .then(() => {
                 // Given a test user that is subscribed to Pusher events
                 User.subscribeToUserEvents();
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => TestHelper.setPersonalDetails(USER_1_LOGIN, USER_1_ACCOUNT_ID))
             .then(() => {
@@ -241,7 +255,7 @@ describe('actions/Report', () => {
                         },
                     },
                 ]);
-                return waitForPromisesToResolve();
+                return waitForNetworkPromises();
             })
             .then(() => {
                 // Then the report will be unread
@@ -255,7 +269,8 @@ describe('actions/Report', () => {
                 currentTime = DateUtils.getDBTime();
                 Report.openReport(REPORT_ID);
                 Report.readNewestAction(REPORT_ID);
-                return waitForPromisesToResolve();
+                waitForBatchedUpdates();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // The report will be read
@@ -268,7 +283,7 @@ describe('actions/Report', () => {
                 // When the user manually marks a message as "unread"
                 jest.advanceTimersByTime(10);
                 Report.markCommentAsUnread(REPORT_ID, reportActionCreatedDate);
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // Then the report will be unread and show the green dot for unread mentions in LHN
@@ -280,7 +295,7 @@ describe('actions/Report', () => {
                 jest.advanceTimersByTime(10);
                 currentTime = DateUtils.getDBTime();
                 Report.addComment(REPORT_ID, 'Current User Comment 1');
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // The report will be read, the green dot for unread mentions will go away, and the lastReadTime updated
@@ -293,7 +308,7 @@ describe('actions/Report', () => {
                 jest.advanceTimersByTime(10);
                 currentTime = DateUtils.getDBTime();
                 Report.addComment(REPORT_ID, 'Current User Comment 2');
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // The report will be read and the lastReadTime updated
@@ -305,7 +320,7 @@ describe('actions/Report', () => {
                 jest.advanceTimersByTime(10);
                 currentTime = DateUtils.getDBTime();
                 Report.addComment(REPORT_ID, 'Current User Comment 3');
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // The report will be read and the lastReadTime updated
@@ -369,12 +384,12 @@ describe('actions/Report', () => {
                     optimisticReportActions,
                 ]);
 
-                return waitForPromisesToResolve();
+                return waitForNetworkPromises();
             })
             .then(() => {
                 // If the user deletes a comment that is before the last read
                 Report.deleteReportComment(REPORT_ID, {...reportActions[200]});
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // Then no change will occur
@@ -383,7 +398,7 @@ describe('actions/Report', () => {
 
                 // When the user manually marks a message as "unread"
                 Report.markCommentAsUnread(REPORT_ID, reportActionCreatedDate);
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // Then we should expect the report to be to be unread
@@ -392,12 +407,14 @@ describe('actions/Report', () => {
 
                 // If the user deletes the last comment after the lastReadTime the lastMessageText will reflect the new last comment
                 Report.deleteReportComment(REPORT_ID, {...reportActions[400]});
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 expect(ReportUtils.isUnread(report)).toBe(false);
                 expect(report.lastMessageText).toBe('Current User Comment 2');
             });
+        waitForBatchedUpdates(); // flushing onyx.set as it will be batched
+        return setPromise;
     });
 
     it('Should properly update comment with links', () => {
@@ -406,6 +423,8 @@ describe('actions/Report', () => {
          * already in the comment and the user deleted it on purpose.
          */
 
+        global.fetch = TestHelper.getGlobalFetchMock();
+
         // User edits comment to add link
         // We should generate link
         let originalCommentHTML = 'Original Comment';
@@ -484,13 +503,16 @@ describe('actions/Report', () => {
     it('should show a notification for report action updates with shouldNotify', () => {
         const TEST_USER_ACCOUNT_ID = 1;
         const REPORT_ID = '1';
-        const REPORT_ACTION = {};
+        const REPORT_ACTION = {
+            actionName: CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT,
+        };
 
         // Setup user and pusher listeners
         return TestHelper.signInWithTestUser(TEST_USER_ACCOUNT_ID)
+            .then(waitForBatchedUpdates)
             .then(() => {
                 User.subscribeToUserEvents();
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // Simulate a Pusher Onyx update with a report action with shouldNotify
@@ -504,7 +526,7 @@ describe('actions/Report', () => {
                         shouldNotify: true,
                     },
                 ]);
-                return waitForPromisesToResolve();
+                return SequentialQueue.getCurrentRequest().then(waitForBatchedUpdates);
             })
             .then(() => {
                 // Ensure we show a notification for this new report action
@@ -546,14 +568,14 @@ describe('actions/Report', () => {
         return TestHelper.signInWithTestUser(TEST_USER_ACCOUNT_ID, TEST_USER_LOGIN)
             .then(() => {
                 User.subscribeToUserEvents();
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => TestHelper.setPersonalDetails(TEST_USER_LOGIN, TEST_USER_ACCOUNT_ID))
             .then(() => {
                 // This is a fire and forget response, but once it completes we should be able to verify that we
                 // have an "optimistic" report action in Onyx.
                 Report.addComment(REPORT_ID, 'Testing a comment');
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 reportAction = _.first(_.values(reportActions));
@@ -561,7 +583,7 @@ describe('actions/Report', () => {
 
                 // Add a reaction to the comment
                 Report.toggleEmojiReaction(REPORT_ID, reportAction, EMOJI);
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 reportAction = _.first(_.values(reportActions));
@@ -579,7 +601,7 @@ describe('actions/Report', () => {
 
                 // Now we remove the reaction
                 Report.toggleEmojiReaction(REPORT_ID, reportAction, EMOJI, reportActionReaction);
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // Expect the reaction to have null where the users reaction used to be
@@ -592,13 +614,13 @@ describe('actions/Report', () => {
 
                 // Add the same reaction to the same report action with a different skintone
                 Report.toggleEmojiReaction(REPORT_ID, reportAction, EMOJI);
-                return waitForPromisesToResolve()
+                return waitForBatchedUpdates()
                     .then(() => {
                         reportAction = _.first(_.values(reportActions));
 
                         const reportActionReaction = reportActionsReactions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${reportActionID}`];
                         Report.toggleEmojiReaction(REPORT_ID, reportAction, EMOJI, reportActionReaction, EMOJI_SKIN_TONE);
-                        return waitForPromisesToResolve();
+                        return waitForBatchedUpdates();
                     })
                     .then(() => {
                         reportAction = _.first(_.values(reportActions));
@@ -621,7 +643,7 @@ describe('actions/Report', () => {
 
                         // Now we remove the reaction, and expect that both variations are removed
                         Report.toggleEmojiReaction(REPORT_ID, reportAction, EMOJI, reportActionReaction);
-                        return waitForPromisesToResolve();
+                        return waitForBatchedUpdates();
                     })
                     .then(() => {
                         // Expect the reaction to have null where the users reaction used to be
@@ -664,21 +686,21 @@ describe('actions/Report', () => {
         return TestHelper.signInWithTestUser(TEST_USER_ACCOUNT_ID, TEST_USER_LOGIN)
             .then(() => {
                 User.subscribeToUserEvents();
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => TestHelper.setPersonalDetails(TEST_USER_LOGIN, TEST_USER_ACCOUNT_ID))
             .then(() => {
                 // This is a fire and forget response, but once it completes we should be able to verify that we
                 // have an "optimistic" report action in Onyx.
                 Report.addComment(REPORT_ID, 'Testing a comment');
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 resultAction = _.first(_.values(reportActions));
 
                 // Add a reaction to the comment
                 Report.toggleEmojiReaction(REPORT_ID, resultAction, EMOJI, {});
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 resultAction = _.first(_.values(reportActions));
@@ -688,7 +710,7 @@ describe('actions/Report', () => {
                 // should get removed instead of added again.
                 const reportActionReaction = reportActionsReactions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${resultAction.reportActionID}`];
                 Report.toggleEmojiReaction(REPORT_ID, resultAction, EMOJI, reportActionReaction, 2);
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // Expect the reaction to have null where the users reaction used to be
diff --git a/tests/actions/SessionTest.js b/tests/actions/SessionTest.js
index 59a7441679ea..4ecb2a33b763 100644
--- a/tests/actions/SessionTest.js
+++ b/tests/actions/SessionTest.js
@@ -1,7 +1,7 @@
 import Onyx from 'react-native-onyx';
 import {beforeEach, jest, test} from '@jest/globals';
 import HttpUtils from '../../src/libs/HttpUtils';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import ONYXKEYS from '../../src/ONYXKEYS';
 import * as TestHelper from '../utils/TestHelper';
 import CONST from '../../src/CONST';
@@ -26,7 +26,7 @@ Onyx.init({
 });
 
 OnyxUpdateManager();
-beforeEach(() => Onyx.clear().then(waitForPromisesToResolve));
+beforeEach(() => Onyx.clear().then(waitForBatchedUpdates));
 
 describe('Session', () => {
     test('Authenticate is called with saved credentials when a session expires', () => {
@@ -50,6 +50,7 @@ describe('Session', () => {
 
         // When we sign in with the test user
         return TestHelper.signInWithTestUser(TEST_USER_ACCOUNT_ID, TEST_USER_LOGIN, 'Password1', TEST_INITIAL_AUTH_TOKEN)
+            .then(waitForBatchedUpdates)
             .then(() => {
                 // Then our re-authentication credentials should be generated and our session data
                 // have the correct information + initial authToken.
@@ -87,7 +88,7 @@ describe('Session', () => {
                 // When we attempt to fetch the initial app data via the API
                 App.confirmReadyToOpenApp();
                 App.openApp();
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // Then it should fail and reauthenticate the user adding the new authToken to the session
@@ -96,7 +97,10 @@ describe('Session', () => {
             });
     });
 
-    test('Push notifications are subscribed after signing in', () => TestHelper.signInWithTestUser().then(() => expect(PushNotification.register).toBeCalled()));
+    test('Push notifications are subscribed after signing in', () =>
+        TestHelper.signInWithTestUser()
+            .then(waitForBatchedUpdates)
+            .then(() => expect(PushNotification.register).toBeCalled()));
 
     test('Push notifications are unsubscribed after signing out', () =>
         TestHelper.signInWithTestUser()
diff --git a/tests/e2e/ADDING_TESTS.md b/tests/e2e/ADDING_TESTS.md
index 39cdb97ebed0..dcd08aeee441 100644
--- a/tests/e2e/ADDING_TESTS.md
+++ b/tests/e2e/ADDING_TESTS.md
@@ -1,4 +1,51 @@
-# Add E2E Tests
+# Adding new E2E Tests
+
+## Running your new test in development mode
+
+Typically you'd run all the tests with `npm run test:e2e` on your machine,
+this will run the tests with some local settings, however that is not
+optimal when you add a new test for which you want to quickly test if it works, as it
+still runs the release version of the app.
+
+I recommend doing the following.
+
+> [!NOTE]
+> All of the steps can be executed at once by running XXX (todo)
+
+1. Rename `./index.js` to `./appIndex.js`
+2. Create a new `./index.js` with the following content:
+```js
+requrire("./src/libs/E2E/reactNativeLaunchingTest.js");
+```
+3. In `./src/libs/E2E/reactNativeLaunchingTest.js` change the main app import to the new `./appIndex.js` file:
+```diff
+- import '../../../index';
++ import '../../../appIndex';
+```
+
+> [!WARNING]
+> Make sure to not commit these changes to the repository!
+
+Now you can start the metro bundler in e2e mode with:
+
+```
+CAPTURE_METRICS=TRUE E2E_Testing=true npm start -- --reset-cache
+```
+
+Then we can execute our test with:
+
+```
+npm run test:e2e -- --development --skipInstallDeps --buildMode skip --includes "My new test name"
+```
+
+> - `--development` will run the tests with a local config, which will run the tests with fewer iterations
+> - `--skipInstallDeps` will skip the `npm install` step, which you probably don't need
+> - `--buildMode skip` will skip rebuilding the app, and just run the existing app
+> - `--includes "MyTestName"` will only run the test with the name "MyTestName"
+
+
+
+## Creating a new test
 
 Tests are executed on device, inside the app code.
 
@@ -37,7 +84,7 @@ that you might need to pass to the test running inside the app:
 
 ### Create the actual test
 
-We created a new test file in `src/libs/E2E/tests/`. Typically, the 
+We created a new test file in `src/libs/E2E/tests/`. Typically, the
 tests ends on `.e2e.js`, so we can distinguish it from the other tests.
 
 Inside this test, we write logic that gets executed in the app. You can basically do
@@ -61,9 +108,9 @@ import E2EClient from "./client.js";
 
 const test = () => {
   const firstReportIDInList = // ... some logic to get a report
-  
+
   performance.markStart("navigateToReport");
-  Navigation.navigate(ROUTES.getReportRoute(firstReportIDInList));
+  Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(firstReportIDInList));
 
   // markEnd will be called in the Screen's implementation
   performance.subscribeToMeasurements("navigateToReport", (measurement) => {
@@ -73,7 +120,7 @@ const test = () => {
           duration: measurement.duration,
       }).then(E2EClient.submitTestDone)
   });
-    
+
 };
 
 export default test;
@@ -97,6 +144,10 @@ Done! When you now start the test runner, your new test will be executed as well
 ## Quickly test your test
 
 To check your new test you can simply run `npm run test:e2e`, which uses the
-`--development` flag. This will run the tests on the branch you are currently on
-and will do fewer iterations.
+`--development` flag. This will run the tests on the branch you are currently on, runs fewer iterations and most importantly, it tries to reuse the existing APK and just patch into the new app bundle, instead of rebuilding the release app from scratch.
+
+## Debugging your test
+
+You can use regular console statements to debug your test. The output will be visible
+in logcat. I recommend opening the android studio logcat window and filter for `ReactNativeJS` to see the output you'd otherwise typically see in your metro bundler instance.
 
diff --git a/tests/e2e/config.js b/tests/e2e/config.js
index d322fb970b2d..d7844a29f3e4 100644
--- a/tests/e2e/config.js
+++ b/tests/e2e/config.js
@@ -21,7 +21,7 @@ const TEST_NAMES = {
  * ```
  */
 module.exports = {
-    APP_PACKAGE: 'com.expensify.chat',
+    APP_PACKAGE: 'com.expensify.chat.adhoc',
 
     APP_PATHS: {
         baseline: './app-e2eRelease-baseline.apk',
diff --git a/tests/e2e/config.local.js b/tests/e2e/config.local.js
index cd0b04d7c3cf..0c38c3f1056f 100644
--- a/tests/e2e/config.local.js
+++ b/tests/e2e/config.local.js
@@ -1,8 +1,10 @@
 module.exports = {
+    APP_PACKAGE: 'com.expensify.chat.dev',
+
     WARM_UP_RUNS: 1,
     RUNS: 8,
     APP_PATHS: {
-        baseline: './android/app/build/outputs/apk/e2eRelease/app-e2eRelease.apk',
-        compare: './android/app/build/outputs/apk/e2eRelease/app-e2eRelease.apk',
+        baseline: './android/app/build/outputs/apk/e2e/release/app-e2e-release.apk',
+        compare: './android/app/build/outputs/apk/e2e/release/app-e2e-release.apk',
     },
 };
diff --git a/tests/e2e/testRunner.js b/tests/e2e/testRunner.js
index db421ae64ef1..2a5aee78715f 100644
--- a/tests/e2e/testRunner.js
+++ b/tests/e2e/testRunner.js
@@ -73,9 +73,9 @@ if (isDevMode) {
 
 const restartApp = async () => {
     Logger.log('Killing app …');
-    await killApp('android');
+    await killApp('android', config.APP_PACKAGE);
     Logger.log('Launching app …');
-    await launchApp('android');
+    await launchApp('android', config.APP_PACKAGE);
 };
 
 const runTestsOnBranch = async (baselineOrCompare, branch) => {
@@ -89,6 +89,8 @@ const runTestsOnBranch = async (baselineOrCompare, branch) => {
         const appExists = fs.existsSync(appPath);
         if (!appExists) {
             Logger.warn(`Build mode "${buildMode}" is not possible, because the app does not exist. Falling back to build mode "full".`);
+            Logger.note(`App path: ${appPath}`);
+
             buildMode = 'full';
         }
     }
@@ -125,7 +127,7 @@ const runTestsOnBranch = async (baselineOrCompare, branch) => {
 
     // Install app and reverse port
     let progressLog = Logger.progressInfo('Installing app and reversing port');
-    await installApp('android', appPath);
+    await installApp('android', config.APP_PACKAGE, appPath);
     await reversePort();
     progressLog.done();
 
diff --git a/tests/e2e/utils/installApp.js b/tests/e2e/utils/installApp.js
index 136602375f85..ff961940826a 100644
--- a/tests/e2e/utils/installApp.js
+++ b/tests/e2e/utils/installApp.js
@@ -7,16 +7,17 @@ const Logger = require('./logger');
  * It removes the app first if it already exists, so it's a clean installation.
  *
  * @param {String} platform
+ * @param {String} packageName
  * @param {String} path
  * @returns {Promise<void>}
  */
-module.exports = function (platform = 'android', path) {
+module.exports = function (platform = 'android', packageName = APP_PACKAGE, path) {
     if (platform !== 'android') {
         throw new Error(`installApp() missing implementation for platform: ${platform}`);
     }
 
     // Uninstall first, then install
-    return execAsync(`adb uninstall ${APP_PACKAGE}`)
+    return execAsync(`adb uninstall ${packageName}`)
         .catch((e) => {
             // Ignore errors
             Logger.warn('Failed to uninstall app:', e);
diff --git a/tests/e2e/utils/killApp.js b/tests/e2e/utils/killApp.js
index 9761ee7fc66e..bdef215bf752 100644
--- a/tests/e2e/utils/killApp.js
+++ b/tests/e2e/utils/killApp.js
@@ -1,11 +1,11 @@
 const {APP_PACKAGE} = require('../config');
 const execAsync = require('./execAsync');
 
-module.exports = function (platform = 'android') {
+module.exports = function (platform = 'android', packageName = APP_PACKAGE) {
     if (platform !== 'android') {
         throw new Error(`killApp() missing implementation for platform: ${platform}`);
     }
 
     // Use adb to kill the app
-    return execAsync(`adb shell am force-stop ${APP_PACKAGE}`);
+    return execAsync(`adb shell am force-stop ${packageName}`);
 };
diff --git a/tests/e2e/utils/launchApp.js b/tests/e2e/utils/launchApp.js
index dce17c7fbb3b..e0726d081086 100644
--- a/tests/e2e/utils/launchApp.js
+++ b/tests/e2e/utils/launchApp.js
@@ -1,11 +1,11 @@
 const {APP_PACKAGE} = require('../config');
 const execAsync = require('./execAsync');
 
-module.exports = function (platform = 'android') {
+module.exports = function (platform = 'android', packageName = APP_PACKAGE) {
     if (platform !== 'android') {
         throw new Error(`launchApp() missing implementation for platform: ${platform}`);
     }
 
     // Use adb to start the app
-    return execAsync(`adb shell monkey -p ${APP_PACKAGE} -c android.intent.category.LAUNCHER 1`);
+    return execAsync(`adb shell monkey -p ${packageName} -c android.intent.category.LAUNCHER 1`);
 };
diff --git a/tests/e2e/utils/logger.js b/tests/e2e/utils/logger.js
index aa198aec3004..1f2fff315bfc 100644
--- a/tests/e2e/utils/logger.js
+++ b/tests/e2e/utils/logger.js
@@ -61,19 +61,16 @@ const progressInfo = (textParam) => {
 };
 
 const info = (...args) => {
-    console.debug('> ', ...args);
-    log(...args);
+    log('> ', ...args);
 };
 
 const warn = (...args) => {
     const lines = [`\n${COLOR_YELLOW}⚠️`, ...args, `${COLOR_RESET}\n`];
-    console.debug(...lines);
     log(...lines);
 };
 
 const note = (...args) => {
     const lines = [`\n💡${COLOR_DIM}`, ...args, `${COLOR_RESET}\n`];
-    console.debug(...lines);
     log(...lines);
 };
 
diff --git a/tests/perf-test/SelectionList.perf-test.js b/tests/perf-test/SelectionList.perf-test.js
index 82cec956713f..cdf9492e0ff3 100644
--- a/tests/perf-test/SelectionList.perf-test.js
+++ b/tests/perf-test/SelectionList.perf-test.js
@@ -21,6 +21,12 @@ jest.mock('../../src/components/withLocalize', () => (Component) => (props) => (
     />
 ));
 
+jest.mock('../../src/hooks/useNetwork', () =>
+    jest.fn(() => ({
+        isOffline: false,
+    })),
+);
+
 jest.mock('../../src/components/withKeyboardState', () => (Component) => (props) => (
     <Component
         // eslint-disable-next-line react/jsx-props-no-spreading
@@ -29,6 +35,12 @@ jest.mock('../../src/components/withKeyboardState', () => (Component) => (props)
     />
 ));
 
+jest.mock('@react-navigation/native', () => ({
+    useFocusEffect: () => {},
+    useIsFocused: () => true,
+    createNavigationContainerRef: jest.fn(),
+}));
+
 function SelectionListWrapper(args) {
     const [selectedIds, setSelectedIds] = useState([]);
 
diff --git a/tests/perf-test/SidebarLinks.perf-test.js b/tests/perf-test/SidebarLinks.perf-test.js
index 4600f42bfd1d..87d2648f78dd 100644
--- a/tests/perf-test/SidebarLinks.perf-test.js
+++ b/tests/perf-test/SidebarLinks.perf-test.js
@@ -3,7 +3,7 @@ import Onyx from 'react-native-onyx';
 import _ from 'underscore';
 import * as LHNTestUtils from '../utils/LHNTestUtils';
 import CONST from '../../src/CONST';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
 jest.mock('../../src/libs/Permissions');
 jest.mock('../../src/components/Icon/Expensicons');
@@ -45,7 +45,7 @@ test('simple Sidebar render with hundred of reports', () => {
     });
     const mockOnyxReports = _.assign({}, ...mockReports);
 
-    return waitForPromisesToResolve()
+    return waitForBatchedUpdates()
         .then(() =>
             Onyx.multiSet({
                 [ONYXKEYS.NVP_PRIORITY_MODE]: CONST.PRIORITY_MODE.DEFAULT,
diff --git a/tests/ui/UnreadIndicatorsTest.js b/tests/ui/UnreadIndicatorsTest.js
index 1666ffb87400..eadc94da6e37 100644
--- a/tests/ui/UnreadIndicatorsTest.js
+++ b/tests/ui/UnreadIndicatorsTest.js
@@ -7,8 +7,8 @@ import moment from 'moment';
 import App from '../../src/App';
 import CONST from '../../src/CONST';
 import ONYXKEYS from '../../src/ONYXKEYS';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
-import waitForPromisesToResolveWithAct from '../utils/waitForPromisesToResolveWithAct';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
 import * as TestHelper from '../utils/TestHelper';
 import appSetup from '../../src/setup';
 import fontWeightBold from '../../src/styles/fontWeight/bold';
@@ -87,7 +87,7 @@ function navigateToSidebar() {
     const hintText = Localize.translateLocal('accessibilityHints.navigateToChatsList');
     const reportHeaderBackButton = screen.queryByAccessibilityHint(hintText);
     fireEvent(reportHeaderBackButton, 'press');
-    return waitForPromisesToResolve();
+    return waitForBatchedUpdates();
 }
 
 /**
@@ -98,7 +98,7 @@ function navigateToSidebarOption(index) {
     const hintText = Localize.translateLocal('accessibilityHints.navigatesToChat');
     const optionRows = screen.queryAllByAccessibilityHint(hintText);
     fireEvent(optionRows[index], 'press');
-    return waitForPromisesToResolve();
+    return waitForBatchedUpdates();
 }
 
 /**
@@ -129,7 +129,7 @@ let reportAction9CreatedDate;
 function signInAndGetAppWithUnreadChat() {
     // Render the App and sign in as a test user.
     render(<App />);
-    return waitForPromisesToResolveWithAct()
+    return waitForBatchedUpdatesWithAct()
         .then(() => {
             const hintText = Localize.translateLocal('loginForm.loginForm');
             const loginForm = screen.queryAllByLabelText(hintText);
@@ -139,7 +139,7 @@ function signInAndGetAppWithUnreadChat() {
         })
         .then(() => {
             User.subscribeToUserEvents();
-            return waitForPromisesToResolve();
+            return waitForBatchedUpdates();
         })
         .then(() => {
             const MOMENT_TEN_MINUTES_AGO = moment().subtract(10, 'minutes');
@@ -192,7 +192,7 @@ function signInAndGetAppWithUnreadChat() {
 
             // We manually setting the sidebar as loaded since the onLayout event does not fire in tests
             AppActions.setSidebarLoaded(true);
-            return waitForPromisesToResolve();
+            return waitForBatchedUpdates();
         });
 }
 
@@ -342,7 +342,7 @@ describe('Unread Indicators', () => {
                         ],
                     },
                 ]);
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // Verify notification was created
@@ -369,6 +369,7 @@ describe('Unread Indicators', () => {
                 // Tap the new report option and navigate back to the sidebar again via the back button
                 return navigateToSidebarOption(0);
             })
+            .then(waitForBatchedUpdates)
             .then(() => {
                 // Verify that report we navigated to appears in a "read" state while the original unread report still shows as unread
                 const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames');
@@ -388,7 +389,7 @@ describe('Unread Indicators', () => {
                 // It's difficult to trigger marking a report comment as unread since we would have to mock the long press event and then
                 // another press on the context menu item so we will do it via the action directly and then test if the UI has updated properly
                 Report.markCommentAsUnread(REPORT_ID, reportAction3CreatedDate);
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // Verify the indicator appears above the last action
@@ -454,7 +455,7 @@ describe('Unread Indicators', () => {
 
                 // Leave a comment as the current user and verify the indicator is removed
                 Report.addComment(REPORT_ID, 'Current User Comment 1');
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 const newMessageLineIndicatorHintText = Localize.translateLocal('accessibilityHints.newMessageLineIndicator');
@@ -487,7 +488,7 @@ describe('Unread Indicators', () => {
 
                 // Mark a previous comment as unread and verify the unread action indicator returns
                 Report.markCommentAsUnread(REPORT_ID, reportAction9CreatedDate);
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 const newMessageLineIndicatorHintText = Localize.translateLocal('accessibilityHints.newMessageLineIndicator');
@@ -517,7 +518,7 @@ describe('Unread Indicators', () => {
                 .then(() => {
                     // Leave a comment as the current user
                     Report.addComment(REPORT_ID, 'Current User Comment 1');
-                    return waitForPromisesToResolve();
+                    return waitForBatchedUpdates();
                 })
                 .then(() => {
                     // Simulate the response from the server so that the comment can be deleted in this test
@@ -528,7 +529,7 @@ describe('Unread Indicators', () => {
                         lastActorAccountID: lastReportAction.actorAccountID,
                         reportID: REPORT_ID,
                     });
-                    return waitForPromisesToResolve();
+                    return waitForBatchedUpdates();
                 })
                 .then(() => {
                     // Verify the chat preview text matches the last comment from the current user
@@ -538,7 +539,7 @@ describe('Unread Indicators', () => {
                     expect(alternateText[0].props.children).toBe('Current User Comment 1');
 
                     Report.deleteReportComment(REPORT_ID, lastReportAction);
-                    return waitForPromisesToResolve();
+                    return waitForBatchedUpdates();
                 })
                 .then(() => {
                     const hintText = Localize.translateLocal('accessibilityHints.lastChatMessagePreview');
diff --git a/tests/unit/APITest.js b/tests/unit/APITest.js
index eeeddc70fc47..395f1438b666 100644
--- a/tests/unit/APITest.js
+++ b/tests/unit/APITest.js
@@ -3,7 +3,7 @@ import _ from 'underscore';
 
 import * as TestHelper from '../utils/TestHelper';
 import HttpUtils from '../../src/libs/HttpUtils';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import ONYXKEYS from '../../src/ONYXKEYS';
 import CONST from '../../src/CONST';
 import * as NetworkStore from '../../src/libs/Network/NetworkStore';
@@ -12,9 +12,10 @@ import * as MainQueue from '../../src/libs/Network/MainQueue';
 import * as API from '../../src/libs/API';
 import * as SequentialQueue from '../../src/libs/Network/SequentialQueue';
 import * as Request from '../../src/libs/Request';
+import * as RequestThrottle from '../../src/libs/RequestThrottle';
+import waitForNetworkPromises from '../utils/waitForNetworkPromises';
 
 jest.mock('../../src/libs/Log');
-jest.useFakeTimers();
 
 Onyx.init({
     keys: ONYXKEYS,
@@ -31,10 +32,9 @@ beforeEach(() => {
     NetworkStore.checkRequiredData();
 
     // Wait for any Log command to finish and Onyx to fully clear
-    jest.advanceTimersByTime(CONST.NETWORK.PROCESS_REQUEST_DELAY_MS);
-    return waitForPromisesToResolve()
+    return waitForBatchedUpdates()
         .then(() => Onyx.clear())
-        .then(waitForPromisesToResolve);
+        .then(waitForBatchedUpdates);
 });
 
 afterEach(() => {
@@ -57,7 +57,7 @@ describe('APITests', () => {
                 API.write('mock command', {param1: 'value1'});
                 API.read('mock command', {param2: 'value2'});
                 API.write('mock command', {param3: 'value3'});
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // Then `xhr` should only be called for the read (where it would not succeed in real life) and write requests should be persisted to storage
@@ -70,7 +70,7 @@ describe('APITests', () => {
                 ]);
 
                 PersistedRequests.clear();
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 expect(PersistedRequests.getAll()).toEqual([]);
@@ -92,7 +92,7 @@ describe('APITests', () => {
                     // When API Write commands are made
                     API.write('mock command', {param1: 'value1'});
                     API.write('mock command', {param2: 'value2'});
-                    return waitForPromisesToResolve();
+                    return waitForBatchedUpdates();
                 })
                 .then(() => {
                     const persisted = PersistedRequests.getAll();
@@ -101,7 +101,7 @@ describe('APITests', () => {
 
                 // When we resume connectivity
                 .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false}))
-                .then(waitForPromisesToResolve)
+                .then(waitForBatchedUpdates)
                 .then(() => {
                     expect(NetworkStore.isOffline()).toBe(false);
                     expect(SequentialQueue.isRunning()).toBe(false);
@@ -141,40 +141,39 @@ describe('APITests', () => {
                     // When API Write commands are made
                     API.write('mock command', {param1: 'value1'});
                     API.write('mock command', {param2: 'value2'});
-                    return waitForPromisesToResolve();
+                    return waitForBatchedUpdates();
                 })
 
                 // When we resume connectivity
                 .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false}))
-                .then(waitForPromisesToResolve)
+                .then(waitForBatchedUpdates)
                 .then(() => {
                     // Then requests should remain persisted until the xhr call is resolved
                     expect(_.size(PersistedRequests.getAll())).toEqual(2);
 
                     xhrCalls[0].resolve({jsonCode: CONST.JSON_CODE.SUCCESS});
-                    return waitForPromisesToResolve();
+                    return waitForBatchedUpdates();
                 })
-                .then(waitForPromisesToResolve)
+                .then(waitForBatchedUpdates)
                 .then(() => {
                     expect(_.size(PersistedRequests.getAll())).toEqual(1);
                     expect(PersistedRequests.getAll()).toEqual([expect.objectContaining({command: 'mock command', data: expect.objectContaining({param2: 'value2'})})]);
 
                     // When a request fails it should be retried
                     xhrCalls[1].reject(new Error(CONST.ERROR.FAILED_TO_FETCH));
-                    return waitForPromisesToResolve();
+                    return waitForBatchedUpdates();
                 })
                 .then(() => {
                     expect(_.size(PersistedRequests.getAll())).toEqual(1);
                     expect(PersistedRequests.getAll()).toEqual([expect.objectContaining({command: 'mock command', data: expect.objectContaining({param2: 'value2'})})]);
 
                     // We need to advance past the request throttle back off timer because the request won't be retried until then
-                    jest.advanceTimersByTime(CONST.NETWORK.MAX_RANDOM_RETRY_WAIT_TIME_MS);
-                    return waitForPromisesToResolve();
+                    return new Promise((resolve) => setTimeout(resolve, CONST.NETWORK.MAX_RANDOM_RETRY_WAIT_TIME_MS)).then(waitForBatchedUpdates);
                 })
                 .then(() => {
                     // Finally, after it succeeds the queue should be empty
                     xhrCalls[2].resolve({jsonCode: CONST.JSON_CODE.SUCCESS});
-                    return waitForPromisesToResolve();
+                    return waitForBatchedUpdates();
                 })
                 .then(() => {
                     expect(_.size(PersistedRequests.getAll())).toEqual(0);
@@ -204,12 +203,12 @@ describe('APITests', () => {
                 .then(() => {
                     // When API Write commands are made
                     API.write('mock command', {param1: 'value1'});
-                    return waitForPromisesToResolve();
+                    return waitForNetworkPromises();
                 })
 
                 // When we resume connectivity
                 .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false}))
-                .then(waitForPromisesToResolve)
+                .then(waitForBatchedUpdates)
                 .then(() => {
                     // Then there has only been one request so far
                     expect(global.fetch).toHaveBeenCalledTimes(1);
@@ -219,8 +218,7 @@ describe('APITests', () => {
                     expect(PersistedRequests.getAll()).toEqual([expect.objectContaining({command: 'mock command', data: expect.objectContaining({param1: 'value1'})})]);
 
                     // We let the SequentialQueue process again after its wait time
-                    jest.runOnlyPendingTimers();
-                    return waitForPromisesToResolve();
+                    return new Promise((resolve) => setTimeout(resolve, RequestThrottle.getLastRequestWaitTime()));
                 })
                 .then(() => {
                     // Then we have retried the failing request
@@ -231,8 +229,7 @@ describe('APITests', () => {
                     expect(PersistedRequests.getAll()).toEqual([expect.objectContaining({command: 'mock command', data: expect.objectContaining({param1: 'value1'})})]);
 
                     // We let the SequentialQueue process again after its wait time
-                    jest.runOnlyPendingTimers();
-                    return waitForPromisesToResolve();
+                    return new Promise((resolve) => setTimeout(resolve, RequestThrottle.getLastRequestWaitTime())).then(waitForBatchedUpdates);
                 })
                 .then(() => {
                     // Then the request is retried again
@@ -284,16 +281,16 @@ describe('APITests', () => {
         // Given we have a request made while we're offline and we have credentials available to reauthenticate
         Onyx.merge(ONYXKEYS.CREDENTIALS, {autoGeneratedLogin: 'test', autoGeneratedPassword: 'passwd'});
         return (
-            waitForPromisesToResolve()
+            waitForBatchedUpdates()
                 .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: true}))
                 .then(() => {
                     API.write('Mock', {param1: 'value1'});
-                    return waitForPromisesToResolve();
+                    return waitForBatchedUpdates();
                 })
 
                 // When we resume connectivity
                 .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false}))
-                .then(waitForPromisesToResolve)
+                .then(waitForBatchedUpdates)
                 .then(() => {
                     const nonLogCalls = _.filter(xhr.mock.calls, ([commandName]) => commandName !== 'Log');
 
@@ -328,10 +325,10 @@ describe('APITests', () => {
                 API.write('MockCommand', {content: 'value5'});
                 API.write('MockCommand', {content: 'value6'});
 
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false}))
-            .then(waitForPromisesToResolve)
+            .then(waitForBatchedUpdates)
             .then(() => {
                 // Then expect all 7 calls to have been made and for the Writes to be made in the order that we made them
                 // The read command would have been made first (and would have failed in real-life)
@@ -363,10 +360,10 @@ describe('APITests', () => {
                 API.write('MockCommand', {content: 'value4'});
                 API.write('MockCommand', {content: 'value5'});
                 API.write('MockCommand', {content: 'value6'});
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false}))
-            .then(waitForPromisesToResolve)
+            .then(waitForBatchedUpdates)
             .then(() => {
                 // Then expect only 8 calls to have been made total and for them to be made in the order that we made them despite requiring reauthentication
                 expect(xhr.mock.calls.length).toBe(8);
@@ -401,10 +398,11 @@ describe('APITests', () => {
             .then(() => {
                 // When we queue both non-persistable and persistable commands that will trigger reauthentication and go offline at the same time
                 API.makeRequestWithSideEffects('AuthenticatePusher', {content: 'value1'});
+
                 Onyx.set(ONYXKEYS.NETWORK, {isOffline: true});
                 expect(NetworkStore.isOffline()).toBe(false);
                 expect(NetworkStore.isAuthenticating()).toBe(false);
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 API.write('MockCommand');
@@ -416,13 +414,15 @@ describe('APITests', () => {
                 // We should only have a single call at this point as the main queue is stopped since we've gone offline
                 expect(xhr.mock.calls.length).toBe(1);
 
+                waitForBatchedUpdates();
+
                 // Come back from offline to trigger the sequential queue flush
-                return Onyx.set(ONYXKEYS.NETWORK, {isOffline: false});
+                Onyx.set(ONYXKEYS.NETWORK, {isOffline: false});
             })
             .then(() => {
                 // When we wait for the sequential queue to finish
                 expect(SequentialQueue.isRunning()).toBe(true);
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // Then we should expect to see that...
@@ -482,7 +482,7 @@ describe('APITests', () => {
                 // When we go online and wait for promises to resolve
                 return Onyx.set(ONYXKEYS.NETWORK, {isOffline: false});
             })
-            .then(waitForPromisesToResolve)
+            .then(waitForBatchedUpdates)
             .then(() => {
                 expect(processWithMiddleware).toHaveBeenCalled();
 
@@ -495,7 +495,7 @@ describe('APITests', () => {
                     [ONYXKEYS.SESSION]: {authToken: 'oldToken'},
                 });
             })
-            .then(waitForPromisesToResolve)
+            .then(waitForBatchedUpdates)
             .then(() => {
                 // Then we should expect XHR to run
                 expect(xhr).toHaveBeenCalled();
@@ -518,7 +518,7 @@ describe('APITests', () => {
                 expect(PersistedRequests.getAll().length).toBe(2);
 
                 // WHEN we wait for the queue to run and finish processing
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // THEN the queue should be stopped and there should be no more requests to run
@@ -535,8 +535,7 @@ describe('APITests', () => {
                 expect(secondRequestCommandName).toBe('MockCommandThree');
 
                 // WHEN we advance the main queue timer and wait for promises
-                jest.advanceTimersByTime(CONST.NETWORK.PROCESS_REQUEST_DELAY_MS);
-                return waitForPromisesToResolve();
+                return new Promise((resolve) => setTimeout(resolve, CONST.NETWORK.PROCESS_REQUEST_DELAY_MS));
             })
             .then(() => {
                 // THEN we should see that our third (non-persistable) request has run last
diff --git a/tests/unit/CurrencyUtilsTest.js b/tests/unit/CurrencyUtilsTest.js
index 5058c56bfa00..ba61775f30da 100644
--- a/tests/unit/CurrencyUtilsTest.js
+++ b/tests/unit/CurrencyUtilsTest.js
@@ -2,7 +2,7 @@ import _ from 'underscore';
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../src/ONYXKEYS';
 import CONST from '../../src/CONST';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import * as CurrencyUtils from '../../src/libs/CurrencyUtils';
 import LocaleListener from '../../src/libs/Localize/LocaleListener';
 
@@ -30,7 +30,7 @@ describe('CurrencyUtils', () => {
             },
         });
         LocaleListener.connect();
-        return waitForPromisesToResolve();
+        return waitForBatchedUpdates();
     });
 
     afterEach(() => Onyx.clear());
diff --git a/tests/unit/DateUtilsTest.js b/tests/unit/DateUtilsTest.js
index d17c1c052929..d79fd3685948 100644
--- a/tests/unit/DateUtilsTest.js
+++ b/tests/unit/DateUtilsTest.js
@@ -1,10 +1,10 @@
 import Onyx from 'react-native-onyx';
-import {format as tzFormat} from 'date-fns-tz';
+import {format as tzFormat, utcToZonedTime} from 'date-fns-tz';
 import {addMinutes, subHours, subMinutes, subSeconds, format, setMinutes, setHours, subDays, addDays} from 'date-fns';
 import CONST from '../../src/CONST';
 import DateUtils from '../../src/libs/DateUtils';
 import ONYXKEYS from '../../src/ONYXKEYS';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
 const LOCALE = CONST.LOCALES.EN;
 
@@ -17,7 +17,7 @@ describe('DateUtils', () => {
                 [ONYXKEYS.PERSONAL_DETAILS_LIST]: {999: {timezone: {selected: 'UTC'}}},
             },
         });
-        return waitForPromisesToResolve();
+        return waitForBatchedUpdates();
     });
 
     afterEach(() => {
@@ -130,6 +130,34 @@ describe('DateUtils', () => {
         expect(result).toBe(expectedDateTime);
     });
 
+    describe('Date Comparison Functions', () => {
+        const today = new Date();
+        const tomorrow = addDays(today, 1);
+        const yesterday = subDays(today, 1);
+
+        const todayInTimezone = utcToZonedTime(today, timezone);
+        const tomorrowInTimezone = utcToZonedTime(tomorrow, timezone);
+        const yesterdayInTimezone = utcToZonedTime(yesterday, timezone);
+
+        it('isToday should correctly identify today', () => {
+            expect(DateUtils.isToday(todayInTimezone, timezone)).toBe(true);
+            expect(DateUtils.isToday(tomorrowInTimezone, timezone)).toBe(false);
+            expect(DateUtils.isToday(yesterdayInTimezone, timezone)).toBe(false);
+        });
+
+        it('isTomorrow should correctly identify tomorrow', () => {
+            expect(DateUtils.isTomorrow(tomorrowInTimezone, timezone)).toBe(true);
+            expect(DateUtils.isTomorrow(todayInTimezone, timezone)).toBe(false);
+            expect(DateUtils.isTomorrow(yesterdayInTimezone, timezone)).toBe(false);
+        });
+
+        it('isYesterday should correctly identify yesterday', () => {
+            expect(DateUtils.isYesterday(yesterdayInTimezone, timezone)).toBe(true);
+            expect(DateUtils.isYesterday(todayInTimezone, timezone)).toBe(false);
+            expect(DateUtils.isYesterday(tomorrowInTimezone, timezone)).toBe(false);
+        });
+    });
+
     describe('getDBTime', () => {
         it('should return the date in the format expected by the database', () => {
             const getDBTime = DateUtils.getDBTime();
diff --git a/tests/unit/EmojiTest.js b/tests/unit/EmojiTest.js
index 0e9b7a7c8c0f..2cc38648f0d9 100644
--- a/tests/unit/EmojiTest.js
+++ b/tests/unit/EmojiTest.js
@@ -6,7 +6,7 @@ import Emoji from '../../assets/emojis';
 import * as EmojiUtils from '../../src/libs/EmojiUtils';
 import ONYXKEYS from '../../src/ONYXKEYS';
 import * as User from '../../src/libs/actions/User';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import * as TestHelper from '../utils/TestHelper';
 import CONST from '../../src/CONST';
 
@@ -170,8 +170,7 @@ describe('EmojiTest', () => {
 
         beforeEach(() => {
             spy.mockClear();
-            Onyx.clear();
-            return waitForPromisesToResolve();
+            return Onyx.clear();
         });
 
         it('should put a less frequent and recent used emoji behind', () => {
@@ -205,7 +204,7 @@ describe('EmojiTest', () => {
             ];
             Onyx.merge(ONYXKEYS.FREQUENTLY_USED_EMOJIS, frequentlyEmojisList);
 
-            return waitForPromisesToResolve().then(() => {
+            return waitForBatchedUpdates().then(() => {
                 // When add a new emoji
                 const currentTime = moment().unix();
                 const smileEmoji = {code: '😄', name: 'smile'};
@@ -253,7 +252,7 @@ describe('EmojiTest', () => {
             ];
             Onyx.merge(ONYXKEYS.FREQUENTLY_USED_EMOJIS, frequentlyEmojisList);
 
-            return waitForPromisesToResolve().then(() => {
+            return waitForBatchedUpdates().then(() => {
                 // When add an emoji that exists in the list
                 const currentTime = moment().unix();
                 const newEmoji = [smileEmoji];
@@ -295,7 +294,7 @@ describe('EmojiTest', () => {
             ];
             Onyx.merge(ONYXKEYS.FREQUENTLY_USED_EMOJIS, frequentlyEmojisList);
 
-            return waitForPromisesToResolve().then(() => {
+            return waitForBatchedUpdates().then(() => {
                 // When add multiple emojis that either exist or not exist in the list
                 const currentTime = moment().unix();
                 const newEmoji = [smileEmoji, zzzEmoji, impEmoji];
@@ -466,7 +465,7 @@ describe('EmojiTest', () => {
             expect(frequentlyEmojisList.length).toBe(CONST.EMOJI_FREQUENT_ROW_COUNT * CONST.EMOJI_NUM_PER_ROW);
             Onyx.merge(ONYXKEYS.FREQUENTLY_USED_EMOJIS, frequentlyEmojisList);
 
-            return waitForPromisesToResolve().then(() => {
+            return waitForBatchedUpdates().then(() => {
                 // When add new emojis
                 const currentTime = moment().unix();
                 const newEmoji = [bookEmoji, smileEmoji, zzzEmoji, impEmoji, smileEmoji];
diff --git a/tests/unit/FileUtilsTest.js b/tests/unit/FileUtilsTest.js
index 34dc0dfcf129..a5f4f34fe913 100644
--- a/tests/unit/FileUtilsTest.js
+++ b/tests/unit/FileUtilsTest.js
@@ -2,6 +2,8 @@ import CONST from '../../src/CONST';
 import DateUtils from '../../src/libs/DateUtils';
 import * as FileUtils from '../../src/libs/fileDownload/FileUtils';
 
+jest.useFakeTimers();
+
 describe('FileUtils', () => {
     describe('splitExtensionFromFileName', () => {
         it('should return correct file name and extension', () => {
diff --git a/tests/unit/IOUUtilsTest.js b/tests/unit/IOUUtilsTest.js
index 22790ebe721f..9ea30638af87 100644
--- a/tests/unit/IOUUtilsTest.js
+++ b/tests/unit/IOUUtilsTest.js
@@ -2,7 +2,7 @@ import Onyx from 'react-native-onyx';
 import * as IOUUtils from '../../src/libs/IOUUtils';
 import * as ReportUtils from '../../src/libs/ReportUtils';
 import ONYXKEYS from '../../src/ONYXKEYS';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import currencyList from './currencyList.json';
 import * as TransactionUtils from '../../src/libs/TransactionUtils';
 
@@ -13,7 +13,7 @@ function initCurrencyList() {
             [ONYXKEYS.CURRENCY_LIST]: currencyList,
         },
     });
-    return waitForPromisesToResolve();
+    return waitForBatchedUpdates();
 }
 
 describe('IOUUtils', () => {
diff --git a/tests/unit/LocalePhoneNumberTest.js b/tests/unit/LocalePhoneNumberTest.js
index e265cb7a35e6..1435e0819fa4 100644
--- a/tests/unit/LocalePhoneNumberTest.js
+++ b/tests/unit/LocalePhoneNumberTest.js
@@ -1,7 +1,7 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../src/ONYXKEYS';
 import * as LocalePhoneNumber from '../../src/libs/LocalePhoneNumber';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
 const ES_NUMBER = '+34702474537';
 const US_NUMBER = '+18332403627';
@@ -20,7 +20,7 @@ describe('LocalePhoneNumber utils', () => {
             Onyx.multiSet({
                 [ONYXKEYS.SESSION]: {email: 'current@user.com'},
                 [ONYXKEYS.COUNTRY_CODE]: 1,
-            }).then(waitForPromisesToResolve),
+            }).then(waitForBatchedUpdates),
         );
 
         afterEach(() => Onyx.clear());
diff --git a/tests/unit/LocalizeTests.js b/tests/unit/LocalizeTests.js
index eebc3d13ab7b..921cf158a47c 100644
--- a/tests/unit/LocalizeTests.js
+++ b/tests/unit/LocalizeTests.js
@@ -1,5 +1,5 @@
 import Onyx from 'react-native-onyx';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import CONST from '../../src/CONST';
 import ONYXKEYS from '../../src/ONYXKEYS';
 import * as Localize from '../../src/libs/Localize';
@@ -10,7 +10,7 @@ describe('localize', () => {
             keys: {NVP_PREFERRED_LOCALE: ONYXKEYS.NVP_PREFERRED_LOCALE},
             initialKeyStates: {[ONYXKEYS.NVP_PREFERRED_LOCALE]: CONST.LOCALES.DEFAULT},
         });
-        return waitForPromisesToResolve();
+        return waitForBatchedUpdates();
     });
 
     afterEach(() => Onyx.clear());
diff --git a/tests/unit/MigrationTest.js b/tests/unit/MigrationTest.js
index 0171ee640226..60b4e5ebe813 100644
--- a/tests/unit/MigrationTest.js
+++ b/tests/unit/MigrationTest.js
@@ -1,12 +1,8 @@
 import Onyx from 'react-native-onyx';
 import _ from 'underscore';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
-import CONST from '../../src/CONST';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import Log from '../../src/libs/Log';
-import getPlatform from '../../src/libs/getPlatform';
 import AddLastVisibleActionCreated from '../../src/libs/migrations/AddLastVisibleActionCreated';
-import MoveToIndexedDB from '../../src/libs/migrations/MoveToIndexedDB';
-import KeyReportActionsByReportActionID from '../../src/libs/migrations/KeyReportActionsByReportActionID';
 import PersonalDetailsByAccountID from '../../src/libs/migrations/PersonalDetailsByAccountID';
 import CheckForPreviousReportActionID from '../../src/libs/migrations/CheckForPreviousReportActionID';
 import ONYXKEYS from '../../src/ONYXKEYS';
@@ -20,78 +16,13 @@ describe('Migrations', () => {
         Onyx.init({keys: ONYXKEYS});
         LogSpy = jest.spyOn(Log, 'info');
         Log.serverLoggingCallback = () => {};
-        return waitForPromisesToResolve();
+        return waitForBatchedUpdates();
     });
 
     beforeEach(() => {
         jest.clearAllMocks();
         Onyx.clear();
-        return waitForPromisesToResolve();
-    });
-
-    describe('MoveToIndexedDb', () => {
-        let mockMultiSet;
-        beforeEach(() => {
-            getPlatform.mockImplementation(() => CONST.PLATFORM.WEB);
-            mockMultiSet = jest.spyOn(Onyx, 'multiSet').mockImplementation(() => Promise.resolve());
-            localStorage.clear();
-        });
-
-        afterAll(() => {
-            mockMultiSet.mockRestore(Onyx, 'multiSet');
-            localStorage.clear();
-        });
-
-        it('Should do nothing for non web/desktop platforms', () => {
-            // Given the migration is not running on web or desktop
-            getPlatform.mockImplementation(() => CONST.PLATFORM.ANDROID);
-
-            // When the migration runs
-            return MoveToIndexedDB().then(() => {
-                // Then we don't expect any storage calls
-                expect(Onyx.multiSet).not.toHaveBeenCalled();
-            });
-        });
-
-        it('Should do nothing when there is no old session data', () => {
-            // Given no session in old storage medium (localStorage)
-            localStorage.removeItem(ONYXKEYS.SESSION);
-
-            // When the migration runs
-            return MoveToIndexedDB().then(() => {
-                // Then we don't expect any storage calls
-                expect(Onyx.multiSet).not.toHaveBeenCalled();
-            });
-        });
-
-        it('Should migrate Onyx keys in localStorage to (new) Onyx', () => {
-            // Given some old data exists in storage
-            const data = {
-                [ONYXKEYS.SESSION]: {authToken: 'mock-token', loading: false},
-                [ONYXKEYS.ACCOUNT]: {email: 'test@mock.com'},
-                [ONYXKEYS.NETWORK]: {isOffline: true},
-            };
-
-            _.forEach(data, (value, key) => localStorage.setItem(key, JSON.stringify(value)));
-
-            // When the migration runs
-            return MoveToIndexedDB().then(() => {
-                // Then multiset should be called with all the data available in localStorage
-                expect(Onyx.multiSet).toHaveBeenCalledWith(data);
-            });
-        });
-
-        it('Should not clear non Onyx keys from localStorage', () => {
-            // Given some Onyx and non-Onyx data exists in localStorage
-            localStorage.setItem(ONYXKEYS.SESSION, JSON.stringify({authToken: 'mock-token'}));
-            localStorage.setItem('non-onyx-item', 'MOCK');
-
-            // When the migration runs
-            return MoveToIndexedDB().then(() => {
-                // Then non-Onyx data should remain in localStorage
-                expect(localStorage.getItem('non-onyx-item')).toEqual('MOCK');
-            });
-        });
+        return waitForBatchedUpdates();
     });
 
     describe('AddLastVisibleActionCreated', () => {
@@ -150,112 +81,6 @@ describe('Migrations', () => {
             }));
     });
 
-    describe('KeyReportActionsByReportActionID', () => {
-        // Warning: this test has to come before the others in this suite because Onyx.clear leaves traces and keys with null values aren't cleared out between tests
-        it("Should work even if there's no reportAction data in Onyx", () =>
-            KeyReportActionsByReportActionID().then(() =>
-                expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] Skipped migration KeyReportActionsByReportActionID because there were no reportActions'),
-            ));
-
-        it("Should work even if there's zombie reportAction data in Onyx", () =>
-            Onyx.multiSet({
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: null,
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: null,
-            })
-                .then(KeyReportActionsByReportActionID)
-                .then(() => {
-                    expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] Skipped migration KeyReportActionsByReportActionID because there are no actions to migrate');
-                    const connectionID = Onyx.connect({
-                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                        waitForCollectionCallback: true,
-                        callback: (allReportActions) => {
-                            Onyx.disconnect(connectionID);
-                            _.each(allReportActions, (reportActionsForReport) => expect(reportActionsForReport).toBeNull());
-                        },
-                    });
-                }));
-
-        it('Should migrate reportActions to be keyed by reportActionID instead of sequenceNumber', () =>
-            Onyx.multiSet({
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: {
-                    1: {
-                        reportActionID: '1000',
-                        sequenceNumber: 1,
-                    },
-                    2: {
-                        reportActionID: '2000',
-                        sequenceNumber: 2,
-                    },
-                },
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: {
-                    1: {
-                        reportActionID: '3000',
-                        sequenceNumber: 1,
-                    },
-                    2: {
-                        reportActionID: '4000',
-                        sequenceNumber: 2,
-                    },
-                },
-            })
-                .then(KeyReportActionsByReportActionID)
-                .then(() => {
-                    expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] Re-keying reportActions by reportActionID for 2 reports');
-                    const connectionID = Onyx.connect({
-                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                        waitForCollectionCallback: true,
-                        callback: (allReportActions) => {
-                            Onyx.disconnect(connectionID);
-                            expect(_.keys(allReportActions).length).toBe(2);
-                            _.each(allReportActions, (reportActionsForReport) => {
-                                _.each(reportActionsForReport, (reportAction, key) => {
-                                    expect(key).toBe(reportAction.reportActionID);
-                                });
-                            });
-                        },
-                    });
-                }));
-
-        it('Should return early if the migration has already happened', () =>
-            Onyx.multiSet({
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: {
-                    1000: {
-                        reportActionID: '1000',
-                        sequenceNumber: 1,
-                    },
-                    2000: {
-                        reportActionID: '2000',
-                        sequenceNumber: 2,
-                    },
-                },
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: {
-                    3000: {
-                        reportActionID: '3000',
-                    },
-                    4000: {
-                        reportActionID: '4000',
-                    },
-                },
-            })
-                .then(KeyReportActionsByReportActionID)
-                .then(() => {
-                    expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] Skipped migration KeyReportActionsByReportActionID because we already migrated it');
-                    const connectionID = Onyx.connect({
-                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                        waitForCollectionCallback: true,
-                        callback: (allReportActions) => {
-                            Onyx.disconnect(connectionID);
-                            expect(_.keys(allReportActions).length).toBe(2);
-                            _.each(allReportActions, (reportActionsForReport) => {
-                                _.each(reportActionsForReport, (reportAction, key) => {
-                                    expect(key).toBe(reportAction.reportActionID);
-                                });
-                            });
-                        },
-                    });
-                }));
-    });
-
     describe('PersonalDetailsByAccountID', () => {
         const DEPRECATED_ONYX_KEYS = {
             // Deprecated personal details object which was keyed by login instead of accountID.
diff --git a/tests/unit/NetworkTest.js b/tests/unit/NetworkTest.js
index 7d8c4f23197c..bd45ae3c2187 100644
--- a/tests/unit/NetworkTest.js
+++ b/tests/unit/NetworkTest.js
@@ -3,7 +3,7 @@ import Onyx from 'react-native-onyx';
 
 import * as TestHelper from '../utils/TestHelper';
 import HttpUtils from '../../src/libs/HttpUtils';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import ONYXKEYS from '../../src/ONYXKEYS';
 import CONST from '../../src/CONST';
 import * as Network from '../../src/libs/Network';
@@ -17,7 +17,6 @@ import NetworkConnection from '../../src/libs/NetworkConnection';
 import OnyxUpdateManager from '../../src/libs/actions/OnyxUpdateManager';
 
 jest.mock('../../src/libs/Log');
-jest.useFakeTimers();
 
 Onyx.init({
     keys: ONYXKEYS,
@@ -31,14 +30,13 @@ beforeEach(() => {
     HttpUtils.xhr = originalXHR;
     MainQueue.clear();
     HttpUtils.cancelPendingRequests();
-    PersistedRequests.clear();
     NetworkStore.checkRequiredData();
 
     // Wait for any Log command to finish and Onyx to fully clear
-    jest.advanceTimersByTime(CONST.NETWORK.PROCESS_REQUEST_DELAY_MS);
-    return waitForPromisesToResolve()
+    return waitForBatchedUpdates()
+        .then(() => PersistedRequests.clear())
         .then(() => Onyx.clear())
-        .then(waitForPromisesToResolve);
+        .then(waitForBatchedUpdates);
 });
 
 afterEach(() => {
@@ -106,14 +104,14 @@ describe('NetworkTests', () => {
             // This should first trigger re-authentication and then a Failed to fetch
             App.confirmReadyToOpenApp();
             App.openApp();
-            return waitForPromisesToResolve()
+            return waitForBatchedUpdates()
                 .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false}))
                 .then(() => {
                     expect(isOffline).toBe(false);
 
                     // Advance the network request queue by 1 second so that it can realize it's back online
                     jest.advanceTimersByTime(CONST.NETWORK.PROCESS_REQUEST_DELAY_MS);
-                    return waitForPromisesToResolve();
+                    return waitForBatchedUpdates();
                 })
                 .then(() => {
                     // Then we will eventually have 3 calls to chatList and 2 calls to Authenticate
@@ -174,7 +172,7 @@ describe('NetworkTests', () => {
                 App.openApp();
                 App.openApp();
                 App.openApp();
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // We should expect to see the three calls to OpenApp, but only one call to Authenticate.
@@ -214,7 +212,7 @@ describe('NetworkTests', () => {
         // Once credentials are set and we wait for promises to resolve
         Onyx.merge(ONYXKEYS.CREDENTIALS, {login: 'test-login'});
         Onyx.merge(ONYXKEYS.SESSION, {authToken: 'test-auth-token'});
-        return waitForPromisesToResolve().then(() => {
+        return waitForBatchedUpdates().then(() => {
             // Then we should expect the request to have been made since the network is now ready
             expect(spyHttpUtilsXhr).not.toHaveBeenCalled();
         });
@@ -230,16 +228,16 @@ describe('NetworkTests', () => {
         // Given a non-retryable request (that is bound to fail)
         const promise = Network.post('Get');
 
-        return waitForPromisesToResolve()
+        return waitForBatchedUpdates()
             .then(() => {
                 // When network connection is recovered
                 Onyx.merge(ONYXKEYS.NETWORK, {isOffline: false});
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // Advance the network request queue by 1 second so that it can realize it's back online
                 jest.advanceTimersByTime(CONST.NETWORK.PROCESS_REQUEST_DELAY_MS);
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // Then the request should only have been attempted once and we should get an unable to retry
@@ -259,7 +257,7 @@ describe('NetworkTests', () => {
         return Onyx.set(ONYXKEYS.NETWORK, {isOffline: false})
             .then(() => {
                 Network.post('MockBadNetworkResponse', {param1: 'value1'});
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 expect(logHmmmSpy).toHaveBeenCalled();
@@ -275,7 +273,7 @@ describe('NetworkTests', () => {
         return Onyx.set(ONYXKEYS.NETWORK, {isOffline: false})
             .then(() => {
                 Network.post('MockBadNetworkResponse', {param1: 'value1'});
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 expect(logAlertSpy).toHaveBeenCalled();
@@ -294,7 +292,7 @@ describe('NetworkTests', () => {
 
                 // When network calls with are made
                 Network.post('mock command', {param1: 'value1'}).then(onResolved);
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 const response = onResolved.mock.calls[0][0];
@@ -317,7 +315,7 @@ describe('NetworkTests', () => {
                 Network.post('MockCommandThree');
 
                 // WHEN we wait for the requests to all cancel
-                return waitForPromisesToResolve();
+                return waitForBatchedUpdates();
             })
             .then(() => {
                 // THEN expect our queue to be empty and for no requests to have been retried
diff --git a/tests/unit/OptionsListUtilsTest.js b/tests/unit/OptionsListUtilsTest.js
index 7dc47619ffed..6f20e48835fd 100644
--- a/tests/unit/OptionsListUtilsTest.js
+++ b/tests/unit/OptionsListUtilsTest.js
@@ -3,7 +3,7 @@ import Onyx from 'react-native-onyx';
 import * as OptionsListUtils from '../../src/libs/OptionsListUtils';
 import * as ReportUtils from '../../src/libs/ReportUtils';
 import ONYXKEYS from '../../src/ONYXKEYS';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import CONST from '../../src/CONST';
 
 describe('OptionsListUtils', () => {
@@ -280,7 +280,7 @@ describe('OptionsListUtils', () => {
             },
         });
         Onyx.registerLogger(() => {});
-        return waitForPromisesToResolve().then(() => Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, PERSONAL_DETAILS));
+        return waitForBatchedUpdates().then(() => Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, PERSONAL_DETAILS));
     });
 
     it('getSearchOptions()', () => {
@@ -308,7 +308,7 @@ describe('OptionsListUtils', () => {
         expect(results.recentReports[0].text).toBe('Mister Fantastic');
         expect(results.recentReports[1].text).toBe('Mister Fantastic');
 
-        return waitForPromisesToResolve()
+        return waitForBatchedUpdates()
             .then(() => Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, PERSONAL_DETAILS_WITH_PERIODS))
             .then(() => {
                 // When we filter again but provide a searchValue that should match with periods
@@ -320,12 +320,12 @@ describe('OptionsListUtils', () => {
             });
     });
 
-    it('getNewChatOptions()', () => {
+    it('getFilteredOptions()', () => {
         // maxRecentReportsToShow in src/libs/OptionsListUtils.js
         const MAX_RECENT_REPORTS = 5;
 
-        // When we call getNewChatOptions() with no search value
-        let results = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], '');
+        // When we call getFilteredOptions() with no search value
+        let results = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], '');
 
         // We should expect maximimum of 5 recent reports to be returned
         expect(results.recentReports.length).toBe(MAX_RECENT_REPORTS);
@@ -345,7 +345,7 @@ describe('OptionsListUtils', () => {
         expect(personalDetailWithExistingReport.reportID).toBe(2);
 
         // When we only pass personal details
-        results = OptionsListUtils.getNewChatOptions([], PERSONAL_DETAILS, [], '');
+        results = OptionsListUtils.getFilteredOptions([], PERSONAL_DETAILS, [], '');
 
         // We should expect personal details sorted alphabetically
         expect(results.personalDetails[0].text).toBe('Black Panther');
@@ -354,13 +354,13 @@ describe('OptionsListUtils', () => {
         expect(results.personalDetails[3].text).toBe('Invisible Woman');
 
         // When we provide a search value that does not match any personal details
-        results = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], 'magneto');
+        results = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], 'magneto');
 
         // Then no options will be returned
         expect(results.personalDetails.length).toBe(0);
 
         // When we provide a search value that matches an email
-        results = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], 'peterparker@expensify.com');
+        results = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], 'peterparker@expensify.com');
 
         // Then one recentReports will be returned and it will be the correct option
         // personalDetails should be empty array
@@ -369,7 +369,7 @@ describe('OptionsListUtils', () => {
         expect(results.personalDetails.length).toBe(0);
 
         // When we provide a search value that matches a partial display name or email
-        results = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], '.com');
+        results = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], '.com');
 
         // Then several options will be returned and they will be each have the search string in their email or name
         // even though the currently logged in user matches they should not show.
@@ -382,7 +382,7 @@ describe('OptionsListUtils', () => {
         expect(results.recentReports[2].text).toBe('Black Panther');
 
         // Test for Concierge's existence in chat options
-        results = OptionsListUtils.getNewChatOptions(REPORTS_WITH_CONCIERGE, PERSONAL_DETAILS_WITH_CONCIERGE);
+        results = OptionsListUtils.getFilteredOptions(REPORTS_WITH_CONCIERGE, PERSONAL_DETAILS_WITH_CONCIERGE);
 
         // Concierge is included in the results by default. We should expect all the personalDetails to show
         // (minus the 5 that are already showing and the currently logged in user)
@@ -390,30 +390,30 @@ describe('OptionsListUtils', () => {
         expect(results.recentReports).toEqual(expect.arrayContaining([expect.objectContaining({login: 'concierge@expensify.com'})]));
 
         // Test by excluding Concierge from the results
-        results = OptionsListUtils.getNewChatOptions(REPORTS_WITH_CONCIERGE, PERSONAL_DETAILS_WITH_CONCIERGE, [], '', [], [CONST.EMAIL.CONCIERGE]);
+        results = OptionsListUtils.getFilteredOptions(REPORTS_WITH_CONCIERGE, PERSONAL_DETAILS_WITH_CONCIERGE, [], '', [], [CONST.EMAIL.CONCIERGE]);
 
         // All the personalDetails should be returned minus the currently logged in user and Concierge
         expect(results.personalDetails.length).toBe(_.size(PERSONAL_DETAILS_WITH_CONCIERGE) - 2 - MAX_RECENT_REPORTS);
         expect(results.personalDetails).not.toEqual(expect.arrayContaining([expect.objectContaining({login: 'concierge@expensify.com'})]));
 
         // Test by excluding Chronos from the results
-        results = OptionsListUtils.getNewChatOptions(REPORTS_WITH_CHRONOS, PERSONAL_DETAILS_WITH_CHRONOS, [], '', [], [CONST.EMAIL.CHRONOS]);
+        results = OptionsListUtils.getFilteredOptions(REPORTS_WITH_CHRONOS, PERSONAL_DETAILS_WITH_CHRONOS, [], '', [], [CONST.EMAIL.CHRONOS]);
 
         // All the personalDetails should be returned minus the currently logged in user and Concierge
         expect(results.personalDetails.length).toBe(_.size(PERSONAL_DETAILS_WITH_CHRONOS) - 2 - MAX_RECENT_REPORTS);
         expect(results.personalDetails).not.toEqual(expect.arrayContaining([expect.objectContaining({login: 'chronos@expensify.com'})]));
 
         // Test by excluding Receipts from the results
-        results = OptionsListUtils.getNewChatOptions(REPORTS_WITH_RECEIPTS, PERSONAL_DETAILS_WITH_RECEIPTS, [], '', [], [CONST.EMAIL.RECEIPTS]);
+        results = OptionsListUtils.getFilteredOptions(REPORTS_WITH_RECEIPTS, PERSONAL_DETAILS_WITH_RECEIPTS, [], '', [], [CONST.EMAIL.RECEIPTS]);
 
         // All the personalDetails should be returned minus the currently logged in user and Concierge
         expect(results.personalDetails.length).toBe(_.size(PERSONAL_DETAILS_WITH_RECEIPTS) - 2 - MAX_RECENT_REPORTS);
         expect(results.personalDetails).not.toEqual(expect.arrayContaining([expect.objectContaining({login: 'receipts@expensify.com'})]));
     });
 
-    it('getNewChatOptions() for group Chat', () => {
-        // When we call getNewChatOptions() with no search value
-        let results = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], '');
+    it('getFilteredOptions() for group Chat', () => {
+        // When we call getFilteredOptions() with no search value
+        let results = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], '');
 
         // Then we should expect only a maxmimum of 5 recent reports to be returned
         expect(results.recentReports.length).toBe(5);
@@ -434,7 +434,7 @@ describe('OptionsListUtils', () => {
         expect(personalDetailsOverlapWithReports).toBe(false);
 
         // When we search for an option that is only in a personalDetail with no existing report
-        results = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], 'hulk');
+        results = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], 'hulk');
 
         // Then reports should return no results
         expect(results.recentReports.length).toBe(0);
@@ -444,7 +444,7 @@ describe('OptionsListUtils', () => {
         expect(results.personalDetails[0].login).toBe('brucebanner@expensify.com');
 
         // When we search for an option that matches things in both personalDetails and reports
-        results = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], '.com');
+        results = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], '.com');
 
         // Then all single participant reports that match will show up in the recentReports array, Recently used contact should be at the top
         expect(results.recentReports.length).toBe(5);
@@ -454,16 +454,16 @@ describe('OptionsListUtils', () => {
         expect(results.personalDetails.length).toBe(4);
         expect(results.personalDetails[0].login).toBe('natasharomanoff@expensify.com');
 
-        // When we provide no selected options to getNewChatOptions()
-        results = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], '', []);
+        // When we provide no selected options to getFilteredOptions()
+        results = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], '', []);
 
         // Then one of our older report options (not in our five most recent) should appear in the personalDetails
         // but not in recentReports
         expect(_.every(results.recentReports, (option) => option.login !== 'peterparker@expensify.com')).toBe(true);
         expect(_.every(results.personalDetails, (option) => option.login !== 'peterparker@expensify.com')).toBe(false);
 
-        // When we provide a "selected" option to getNewChatOptions()
-        results = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], '', [{login: 'peterparker@expensify.com'}]);
+        // When we provide a "selected" option to getFilteredOptions()
+        results = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], '', [{login: 'peterparker@expensify.com'}]);
 
         // Then the option should not appear anywhere in either list
         expect(_.every(results.recentReports, (option) => option.login !== 'peterparker@expensify.com')).toBe(true);
@@ -471,7 +471,7 @@ describe('OptionsListUtils', () => {
 
         // When we add a search term for which no options exist and the searchValue itself
         // is not a potential email or phone
-        results = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], 'marc@expensify');
+        results = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], 'marc@expensify');
 
         // Then we should have no options or personal details at all and also that there is no userToInvite
         expect(results.recentReports.length).toBe(0);
@@ -480,7 +480,7 @@ describe('OptionsListUtils', () => {
 
         // When we add a search term for which no options exist and the searchValue itself
         // is a potential email
-        results = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], 'marc@expensify.com');
+        results = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], 'marc@expensify.com');
 
         // Then we should have no options or personal details at all but there should be a userToInvite
         expect(results.recentReports.length).toBe(0);
@@ -488,7 +488,7 @@ describe('OptionsListUtils', () => {
         expect(results.userToInvite).not.toBe(null);
 
         // When we add a search term with a period, with options for it that don't contain the period
-        results = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], 'peter.parker@expensify.com');
+        results = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], 'peter.parker@expensify.com');
 
         // Then we should have no options at all but there should be a userToInvite
         expect(results.recentReports.length).toBe(0);
@@ -496,7 +496,7 @@ describe('OptionsListUtils', () => {
 
         // When we add a search term for which no options exist and the searchValue itself
         // is a potential phone number without country code added
-        results = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], '5005550006');
+        results = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], '5005550006');
 
         // Then we should have no options or personal details at all but there should be a userToInvite and the login
         // should have the country code included
@@ -507,7 +507,7 @@ describe('OptionsListUtils', () => {
 
         // When we add a search term for which no options exist and the searchValue itself
         // is a potential phone number with country code added
-        results = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], '+15005550006');
+        results = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], '+15005550006');
 
         // Then we should have no options or personal details at all but there should be a userToInvite and the login
         // should have the country code included
@@ -518,7 +518,7 @@ describe('OptionsListUtils', () => {
 
         // When we add a search term for which no options exist and the searchValue itself
         // is a potential phone number with special characters added
-        results = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], '+1 (800)324-3233');
+        results = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], '+1 (800)324-3233');
 
         // Then we should have no options or personal details at all but there should be a userToInvite and the login
         // should have the country code included
@@ -528,7 +528,7 @@ describe('OptionsListUtils', () => {
         expect(results.userToInvite.login).toBe('+18003243233');
 
         // When we use a search term for contact number that contains alphabet characters
-        results = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], '998243aaaa');
+        results = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], '998243aaaa');
 
         // Then we shouldn't have any results or user to invite
         expect(results.recentReports.length).toBe(0);
@@ -536,7 +536,7 @@ describe('OptionsListUtils', () => {
         expect(results.userToInvite).toBe(null);
 
         // Test Concierge's existence in new group options
-        results = OptionsListUtils.getNewChatOptions(REPORTS_WITH_CONCIERGE, PERSONAL_DETAILS_WITH_CONCIERGE);
+        results = OptionsListUtils.getFilteredOptions(REPORTS_WITH_CONCIERGE, PERSONAL_DETAILS_WITH_CONCIERGE);
 
         // Concierge is included in the results by default. We should expect all the personalDetails to show
         // (minus the 5 that are already showing and the currently logged in user)
@@ -544,7 +544,7 @@ describe('OptionsListUtils', () => {
         expect(results.recentReports).toEqual(expect.arrayContaining([expect.objectContaining({login: 'concierge@expensify.com'})]));
 
         // Test by excluding Concierge from the results
-        results = OptionsListUtils.getNewChatOptions(REPORTS_WITH_CONCIERGE, PERSONAL_DETAILS_WITH_CONCIERGE, [], '', [], [CONST.EMAIL.CONCIERGE]);
+        results = OptionsListUtils.getFilteredOptions(REPORTS_WITH_CONCIERGE, PERSONAL_DETAILS_WITH_CONCIERGE, [], '', [], [CONST.EMAIL.CONCIERGE]);
 
         // We should expect all the personalDetails to show (minus the 5 that are already showing,
         // the currently logged in user and Concierge)
@@ -553,7 +553,7 @@ describe('OptionsListUtils', () => {
         expect(results.recentReports).not.toEqual(expect.arrayContaining([expect.objectContaining({login: 'concierge@expensify.com'})]));
 
         // Test by excluding Chronos from the results
-        results = OptionsListUtils.getNewChatOptions(REPORTS_WITH_CHRONOS, PERSONAL_DETAILS_WITH_CHRONOS, [], '', [], [CONST.EMAIL.CHRONOS]);
+        results = OptionsListUtils.getFilteredOptions(REPORTS_WITH_CHRONOS, PERSONAL_DETAILS_WITH_CHRONOS, [], '', [], [CONST.EMAIL.CHRONOS]);
 
         // We should expect all the personalDetails to show (minus the 5 that are already showing,
         // the currently logged in user and Concierge)
@@ -562,7 +562,7 @@ describe('OptionsListUtils', () => {
         expect(results.recentReports).not.toEqual(expect.arrayContaining([expect.objectContaining({login: 'chronos@expensify.com'})]));
 
         // Test by excluding Receipts from the results
-        results = OptionsListUtils.getNewChatOptions(REPORTS_WITH_RECEIPTS, PERSONAL_DETAILS_WITH_RECEIPTS, [], '', [], [CONST.EMAIL.RECEIPTS]);
+        results = OptionsListUtils.getFilteredOptions(REPORTS_WITH_RECEIPTS, PERSONAL_DETAILS_WITH_RECEIPTS, [], '', [], [CONST.EMAIL.RECEIPTS]);
 
         // We should expect all the personalDetails to show (minus the 5 that are already showing,
         // the currently logged in user and Concierge)
@@ -652,23 +652,15 @@ describe('OptionsListUtils', () => {
         expect(results.personalDetails[0].text).toBe('Spider-Man');
     });
 
-    it('getNewChatOptions() for categories', () => {
+    it('getFilteredOptions() for categories', () => {
         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',
+                enabled: true,
             },
         ];
         const smallCategoriesList = {
@@ -695,13 +687,6 @@ describe('OptionsListUtils', () => {
                 shouldShow: false,
                 indexOffset: 0,
                 data: [
-                    {
-                        text: 'Taxi',
-                        keyForList: 'Taxi',
-                        searchText: 'Taxi',
-                        tooltipText: 'Taxi',
-                        isDisabled: true,
-                    },
                     {
                         text: 'Restaurant',
                         keyForList: 'Restaurant',
@@ -826,7 +811,7 @@ describe('OptionsListUtils', () => {
                         keyForList: 'Medical',
                         searchText: 'Medical',
                         tooltipText: 'Medical',
-                        isDisabled: true,
+                        isDisabled: false,
                     },
                 ],
             },
@@ -835,13 +820,6 @@ describe('OptionsListUtils', () => {
                 shouldShow: true,
                 indexOffset: 1,
                 data: [
-                    {
-                        text: 'Taxi',
-                        keyForList: 'Taxi',
-                        searchText: 'Taxi',
-                        tooltipText: 'Taxi',
-                        isDisabled: true,
-                    },
                     {
                         text: 'Restaurant',
                         keyForList: 'Restaurant',
@@ -856,13 +834,6 @@ describe('OptionsListUtils', () => {
                 shouldShow: true,
                 indexOffset: 3,
                 data: [
-                    {
-                        text: 'Taxi',
-                        keyForList: 'Taxi',
-                        searchText: 'Taxi',
-                        tooltipText: 'Taxi',
-                        isDisabled: true,
-                    },
                     {
                         text: 'Restaurant',
                         keyForList: 'Restaurant',
@@ -891,13 +862,6 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Milk',
                         isDisabled: false,
                     },
-                    {
-                        text: '    Vegetables',
-                        keyForList: 'Vegetables',
-                        searchText: 'Food: Vegetables',
-                        tooltipText: 'Vegetables',
-                        isDisabled: true,
-                    },
                     {
                         text: 'Cars',
                         keyForList: 'Cars',
@@ -912,13 +876,6 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Audi',
                         isDisabled: false,
                     },
-                    {
-                        text: '    BMW',
-                        keyForList: 'BMW',
-                        searchText: 'Cars: BMW',
-                        tooltipText: 'BMW',
-                        isDisabled: true,
-                    },
                     {
                         text: '    Mercedes-Benz',
                         keyForList: 'Mercedes-Benz',
@@ -947,13 +904,6 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Breakfast',
                         isDisabled: false,
                     },
-                    {
-                        text: '        Dinner',
-                        keyForList: 'Dinner',
-                        searchText: 'Travel: Meals: Dinner',
-                        tooltipText: 'Dinner',
-                        isDisabled: true,
-                    },
                     {
                         text: '        Lunch',
                         keyForList: 'Lunch',
@@ -991,13 +941,6 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Food: Milk',
                         isDisabled: false,
                     },
-                    {
-                        text: 'Food: Vegetables',
-                        keyForList: 'Food: Vegetables',
-                        searchText: 'Food: Vegetables',
-                        tooltipText: 'Food: Vegetables',
-                        isDisabled: true,
-                    },
                 ],
             },
         ];
@@ -1009,17 +952,34 @@ describe('OptionsListUtils', () => {
                 data: [],
             },
         ];
+        const emptyCategoriesList = {};
+        const emptySelectedResultList = [
+            {
+                title: '',
+                shouldShow: false,
+                indexOffset: 0,
+                data: [
+                    {
+                        text: 'Medical',
+                        keyForList: 'Medical',
+                        searchText: 'Medical',
+                        tooltipText: 'Medical',
+                        isDisabled: false,
+                    },
+                ],
+            },
+        ];
 
-        const smallResult = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], emptySearch, [], [], false, false, true, smallCategoriesList);
+        const smallResult = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], emptySearch, [], [], false, false, true, smallCategoriesList);
         expect(smallResult.categoryOptions).toStrictEqual(smallResultList);
 
-        const smallSearchResult = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], search, [], [], false, false, true, smallCategoriesList);
+        const smallSearchResult = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], search, [], [], false, false, true, smallCategoriesList);
         expect(smallSearchResult.categoryOptions).toStrictEqual(smallSearchResultList);
 
-        const smallWrongSearchResult = OptionsListUtils.getNewChatOptions(REPORTS, PERSONAL_DETAILS, [], wrongSearch, [], [], false, false, true, smallCategoriesList);
+        const smallWrongSearchResult = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], wrongSearch, [], [], false, false, true, smallCategoriesList);
         expect(smallWrongSearchResult.categoryOptions).toStrictEqual(smallWrongSearchResultList);
 
-        const largeResult = OptionsListUtils.getNewChatOptions(
+        const largeResult = OptionsListUtils.getFilteredOptions(
             REPORTS,
             PERSONAL_DETAILS,
             [],
@@ -1034,7 +994,7 @@ describe('OptionsListUtils', () => {
         );
         expect(largeResult.categoryOptions).toStrictEqual(largeResultList);
 
-        const largeSearchResult = OptionsListUtils.getNewChatOptions(
+        const largeSearchResult = OptionsListUtils.getFilteredOptions(
             REPORTS,
             PERSONAL_DETAILS,
             [],
@@ -1049,7 +1009,7 @@ describe('OptionsListUtils', () => {
         );
         expect(largeSearchResult.categoryOptions).toStrictEqual(largeSearchResultList);
 
-        const largeWrongSearchResult = OptionsListUtils.getNewChatOptions(
+        const largeWrongSearchResult = OptionsListUtils.getFilteredOptions(
             REPORTS,
             PERSONAL_DETAILS,
             [],
@@ -1063,6 +1023,320 @@ describe('OptionsListUtils', () => {
             recentlyUsedCategories,
         );
         expect(largeWrongSearchResult.categoryOptions).toStrictEqual(largeWrongSearchResultList);
+
+        const emptyResult = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], search, selectedOptions, [], false, false, true, emptyCategoriesList);
+        expect(emptyResult.categoryOptions).toStrictEqual(emptySelectedResultList);
+    });
+
+    it('getFilteredOptions() for tags', () => {
+        const search = 'ing';
+        const emptySearch = '';
+        const wrongSearch = 'bla bla';
+        const recentlyUsedTags = ['Engineering', 'HR'];
+
+        const selectedOptions = [
+            {
+                name: 'Medical',
+            },
+        ];
+        const smallTagsList = {
+            Engineering: {
+                enabled: false,
+                name: 'Engineering',
+            },
+            Medical: {
+                enabled: true,
+                name: 'Medical',
+            },
+            Accounting: {
+                enabled: true,
+                name: 'Accounting',
+            },
+            HR: {
+                enabled: true,
+                name: 'HR',
+            },
+        };
+        const smallResultList = [
+            {
+                title: '',
+                shouldShow: false,
+                indexOffset: 0,
+                data: [
+                    {
+                        text: 'Medical',
+                        keyForList: 'Medical',
+                        searchText: 'Medical',
+                        tooltipText: 'Medical',
+                        isDisabled: false,
+                    },
+                    {
+                        text: 'Accounting',
+                        keyForList: 'Accounting',
+                        searchText: 'Accounting',
+                        tooltipText: 'Accounting',
+                        isDisabled: false,
+                    },
+                    {
+                        text: 'HR',
+                        keyForList: 'HR',
+                        searchText: 'HR',
+                        tooltipText: 'HR',
+                        isDisabled: false,
+                    },
+                ],
+            },
+        ];
+        const smallSearchResultList = [
+            {
+                title: '',
+                shouldShow: false,
+                indexOffset: 0,
+                data: [
+                    {
+                        text: 'Accounting',
+                        keyForList: 'Accounting',
+                        searchText: 'Accounting',
+                        tooltipText: 'Accounting',
+                        isDisabled: false,
+                    },
+                ],
+            },
+        ];
+        const smallWrongSearchResultList = [
+            {
+                title: '',
+                shouldShow: false,
+                indexOffset: 0,
+                data: [],
+            },
+        ];
+        const largeTagsList = {
+            Engineering: {
+                enabled: false,
+                name: 'Engineering',
+            },
+            Medical: {
+                enabled: true,
+                name: 'Medical',
+            },
+            Accounting: {
+                enabled: true,
+                name: 'Accounting',
+            },
+            HR: {
+                enabled: true,
+                name: 'HR',
+            },
+            Food: {
+                enabled: true,
+                name: 'Food',
+            },
+            Traveling: {
+                enabled: false,
+                name: 'Traveling',
+            },
+            Cleaning: {
+                enabled: true,
+                name: 'Cleaning',
+            },
+            Software: {
+                enabled: true,
+                name: 'Software',
+            },
+            OfficeSupplies: {
+                enabled: false,
+                name: 'Office Supplies',
+            },
+            Taxes: {
+                enabled: true,
+                name: 'Taxes',
+            },
+            Benefits: {
+                enabled: true,
+                name: 'Benefits',
+            },
+        };
+        const largeResultList = [
+            {
+                title: '',
+                shouldShow: false,
+                indexOffset: 0,
+                data: [
+                    {
+                        text: 'Medical',
+                        keyForList: 'Medical',
+                        searchText: 'Medical',
+                        tooltipText: 'Medical',
+                        isDisabled: false,
+                    },
+                ],
+            },
+            {
+                title: 'Recent',
+                shouldShow: true,
+                indexOffset: 1,
+                data: [
+                    {
+                        text: 'HR',
+                        keyForList: 'HR',
+                        searchText: 'HR',
+                        tooltipText: 'HR',
+                        isDisabled: false,
+                    },
+                ],
+            },
+            {
+                title: 'All',
+                shouldShow: true,
+                indexOffset: 2,
+                data: [
+                    {
+                        text: 'Accounting',
+                        keyForList: 'Accounting',
+                        searchText: 'Accounting',
+                        tooltipText: 'Accounting',
+                        isDisabled: false,
+                    },
+                    {
+                        text: 'HR',
+                        keyForList: 'HR',
+                        searchText: 'HR',
+                        tooltipText: 'HR',
+                        isDisabled: false,
+                    },
+                    {
+                        text: 'Food',
+                        keyForList: 'Food',
+                        searchText: 'Food',
+                        tooltipText: 'Food',
+                        isDisabled: false,
+                    },
+                    {
+                        text: 'Cleaning',
+                        keyForList: 'Cleaning',
+                        searchText: 'Cleaning',
+                        tooltipText: 'Cleaning',
+                        isDisabled: false,
+                    },
+                    {
+                        text: 'Software',
+                        keyForList: 'Software',
+                        searchText: 'Software',
+                        tooltipText: 'Software',
+                        isDisabled: false,
+                    },
+                    {
+                        text: 'Taxes',
+                        keyForList: 'Taxes',
+                        searchText: 'Taxes',
+                        tooltipText: 'Taxes',
+                        isDisabled: false,
+                    },
+                    {
+                        text: 'Benefits',
+                        keyForList: 'Benefits',
+                        searchText: 'Benefits',
+                        tooltipText: 'Benefits',
+                        isDisabled: false,
+                    },
+                ],
+            },
+        ];
+        const largeSearchResultList = [
+            {
+                title: '',
+                shouldShow: false,
+                indexOffset: 0,
+                data: [
+                    {
+                        text: 'Accounting',
+                        keyForList: 'Accounting',
+                        searchText: 'Accounting',
+                        tooltipText: 'Accounting',
+                        isDisabled: false,
+                    },
+                    {
+                        text: 'Cleaning',
+                        keyForList: 'Cleaning',
+                        searchText: 'Cleaning',
+                        tooltipText: 'Cleaning',
+                        isDisabled: false,
+                    },
+                ],
+            },
+        ];
+        const largeWrongSearchResultList = [
+            {
+                title: '',
+                shouldShow: false,
+                indexOffset: 0,
+                data: [],
+            },
+        ];
+
+        const smallResult = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], emptySearch, [], [], false, false, false, {}, [], true, smallTagsList);
+        expect(smallResult.tagOptions).toStrictEqual(smallResultList);
+
+        const smallSearchResult = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], search, [], [], false, false, false, {}, [], true, smallTagsList);
+        expect(smallSearchResult.tagOptions).toStrictEqual(smallSearchResultList);
+
+        const smallWrongSearchResult = OptionsListUtils.getFilteredOptions(REPORTS, PERSONAL_DETAILS, [], wrongSearch, [], [], false, false, false, {}, [], true, smallTagsList);
+        expect(smallWrongSearchResult.tagOptions).toStrictEqual(smallWrongSearchResultList);
+
+        const largeResult = OptionsListUtils.getFilteredOptions(
+            REPORTS,
+            PERSONAL_DETAILS,
+            [],
+            emptySearch,
+            selectedOptions,
+            [],
+            false,
+            false,
+            false,
+            {},
+            [],
+            true,
+            largeTagsList,
+            recentlyUsedTags,
+        );
+        expect(largeResult.tagOptions).toStrictEqual(largeResultList);
+
+        const largeSearchResult = OptionsListUtils.getFilteredOptions(
+            REPORTS,
+            PERSONAL_DETAILS,
+            [],
+            search,
+            selectedOptions,
+            [],
+            false,
+            false,
+            false,
+            {},
+            [],
+            true,
+            largeTagsList,
+            recentlyUsedTags,
+        );
+        expect(largeSearchResult.tagOptions).toStrictEqual(largeSearchResultList);
+
+        const largeWrongSearchResult = OptionsListUtils.getFilteredOptions(
+            REPORTS,
+            PERSONAL_DETAILS,
+            [],
+            wrongSearch,
+            selectedOptions,
+            [],
+            false,
+            false,
+            false,
+            {},
+            [],
+            true,
+            largeTagsList,
+            recentlyUsedTags,
+        );
+        expect(largeWrongSearchResult.tagOptions).toStrictEqual(largeWrongSearchResultList);
     });
 
     it('getCategoryOptionTree()', () => {
@@ -1141,13 +1415,6 @@ describe('OptionsListUtils', () => {
             },
         };
         const result = [
-            {
-                text: 'Taxi',
-                keyForList: 'Taxi',
-                searchText: 'Taxi',
-                tooltipText: 'Taxi',
-                isDisabled: true,
-            },
             {
                 text: 'Restaurant',
                 keyForList: 'Restaurant',
@@ -1176,13 +1443,6 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Milk',
                 isDisabled: false,
             },
-            {
-                text: '    Vegetables',
-                keyForList: 'Vegetables',
-                searchText: 'Food: Vegetables',
-                tooltipText: 'Vegetables',
-                isDisabled: true,
-            },
             {
                 text: 'Cars',
                 keyForList: 'Cars',
@@ -1197,13 +1457,6 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Audi',
                 isDisabled: false,
             },
-            {
-                text: '    BMW',
-                keyForList: 'BMW',
-                searchText: 'Cars: BMW',
-                tooltipText: 'BMW',
-                isDisabled: true,
-            },
             {
                 text: '    Mercedes-Benz',
                 keyForList: 'Mercedes-Benz',
@@ -1211,13 +1464,6 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Mercedes-Benz',
                 isDisabled: false,
             },
-            {
-                text: 'Medical',
-                keyForList: 'Medical',
-                searchText: 'Medical',
-                tooltipText: 'Medical',
-                isDisabled: true,
-            },
             {
                 text: 'Travel',
                 keyForList: 'Travel',
@@ -1239,13 +1485,6 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Breakfast',
                 isDisabled: false,
             },
-            {
-                text: '        Dinner',
-                keyForList: 'Dinner',
-                searchText: 'Travel: Meals: Dinner',
-                tooltipText: 'Dinner',
-                isDisabled: true,
-            },
             {
                 text: '        Lunch',
                 keyForList: 'Lunch',
diff --git a/tests/unit/ReportUtilsTest.js b/tests/unit/ReportUtilsTest.js
index e97e9147c328..24397a04a0e9 100644
--- a/tests/unit/ReportUtilsTest.js
+++ b/tests/unit/ReportUtilsTest.js
@@ -3,7 +3,7 @@ import _ from 'underscore';
 import CONST from '../../src/CONST';
 import ONYXKEYS from '../../src/ONYXKEYS';
 import * as ReportUtils from '../../src/libs/ReportUtils';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import * as LHNTestUtils from '../utils/LHNTestUtils';
 
 // Be sure to include the mocked permissions library or else the beta tests won't work
@@ -35,6 +35,13 @@ const participantsPersonalDetails = {
         login: '+18332403627@expensify.sms',
         displayName: '(833) 240-3627',
     },
+    5: {
+        accountID: 5,
+        displayName: 'Lagertha Lothbrok',
+        firstName: 'Lagertha',
+        login: 'lagertha2@vikings.net',
+        pronouns: 'She/her',
+    },
 };
 const policy = {
     policyID: 1,
@@ -51,9 +58,56 @@ describe('ReportUtils', () => {
             [ONYXKEYS.COUNTRY_CODE]: 1,
             [`${ONYXKEYS.COLLECTION.POLICY}${policy.policyID}`]: policy,
         });
-        return waitForPromisesToResolve();
+        return waitForBatchedUpdates();
+    });
+    beforeEach(() => Onyx.set(ONYXKEYS.NVP_PREFERRED_LOCALE, CONST.LOCALES.DEFAULT).then(waitForBatchedUpdates));
+
+    describe('getIconsForParticipants', () => {
+        it('returns sorted avatar source by name, then accountID', () => {
+            expect(ReportUtils.getIconsForParticipants([1, 2, 3, 4, 5], participantsPersonalDetails)).toEqual([
+                {
+                    id: 4,
+                    name: '(833) 240-3627',
+                    source: {
+                        testUri: '../../../assets/images/avatars/user/default-avatar_5.svg',
+                    },
+                    type: 'avatar',
+                },
+                {
+                    id: 2,
+                    name: 'floki@vikings.net',
+                    source: {
+                        testUri: '../../../assets/images/avatars/user/default-avatar_3.svg',
+                    },
+                    type: 'avatar',
+                },
+                {
+                    id: 3,
+                    name: 'Lagertha Lothbrok',
+                    source: {
+                        testUri: '../../../assets/images/avatars/user/default-avatar_4.svg',
+                    },
+                    type: 'avatar',
+                },
+                {
+                    id: 5,
+                    name: 'Lagertha Lothbrok',
+                    source: {
+                        testUri: '../../../assets/images/avatars/user/default-avatar_6.svg',
+                    },
+                    type: 'avatar',
+                },
+                {
+                    id: 1,
+                    name: 'Ragnar Lothbrok',
+                    source: {
+                        testUri: '../../../assets/images/avatars/user/default-avatar_2.svg',
+                    },
+                    type: 'avatar',
+                },
+            ]);
+        });
     });
-    beforeEach(() => Onyx.set(ONYXKEYS.NVP_PREFERRED_LOCALE, CONST.LOCALES.DEFAULT).then(waitForPromisesToResolve));
 
     describe('getDisplayNamesWithTooltips', () => {
         test('withSingleParticipantReport', () => {
@@ -94,6 +148,15 @@ describe('ReportUtils', () => {
                     accountID: 4,
                     pronouns: undefined,
                 },
+                {
+                    displayName: 'Lagertha Lothbrok',
+                    avatar: {
+                        testUri: '../../../assets/images/avatars/user/default-avatar_6.svg',
+                    },
+                    login: 'lagertha2@vikings.net',
+                    accountID: 5,
+                    pronouns: 'She/her',
+                },
             ]);
         });
 
@@ -135,6 +198,15 @@ describe('ReportUtils', () => {
                     accountID: 4,
                     pronouns: undefined,
                 },
+                {
+                    displayName: 'Lagertha',
+                    avatar: {
+                        testUri: '../../../assets/images/avatars/user/default-avatar_6.svg',
+                    },
+                    login: 'lagertha2@vikings.net',
+                    accountID: 5,
+                    pronouns: 'She/her',
+                },
             ]);
         });
     });
diff --git a/tests/unit/RequestTest.js b/tests/unit/RequestTest.js
index 07943732030d..fb1032e70cfe 100644
--- a/tests/unit/RequestTest.js
+++ b/tests/unit/RequestTest.js
@@ -1,5 +1,5 @@
 import * as Request from '../../src/libs/Request';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import * as TestHelper from '../utils/TestHelper';
 
 beforeAll(() => {
@@ -19,7 +19,7 @@ test('Request.use() can register a middleware and it will run', () => {
     };
 
     Request.processWithMiddleware(request, true);
-    return waitForPromisesToResolve().then(() => {
+    return waitForBatchedUpdates().then(() => {
         const [promise, returnedRequest, isFromSequentialQueue] = testMiddleware.mock.calls[0];
         expect(testMiddleware).toHaveBeenCalled();
         expect(returnedRequest).toEqual(request);
@@ -57,7 +57,7 @@ test('Request.use() can register two middlewares. They can pass a response to th
 
     const catchHandler = jest.fn();
     Request.processWithMiddleware(request).catch(catchHandler);
-    return waitForPromisesToResolve().then(() => {
+    return waitForBatchedUpdates().then(() => {
         expect(catchHandler).toHaveBeenCalled();
         expect(catchHandler).toHaveBeenCalledWith(new Error('Oops'));
     });
diff --git a/tests/unit/SidebarFilterTest.js b/tests/unit/SidebarFilterTest.js
index 85d409969133..18e499d89293 100644
--- a/tests/unit/SidebarFilterTest.js
+++ b/tests/unit/SidebarFilterTest.js
@@ -2,8 +2,8 @@ import {cleanup, screen} from '@testing-library/react-native';
 import Onyx from 'react-native-onyx';
 import lodashGet from 'lodash/get';
 import * as LHNTestUtils from '../utils/LHNTestUtils';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
-import wrapOnyxWithWaitForPromisesToResolve from '../utils/wrapOnyxWithWaitForPromisesToResolve';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+import wrapOnyxWithWaitForBatchedUpdates from '../utils/wrapOnyxWithWaitForBatchedUpdates';
 import CONST from '../../src/CONST';
 import DateUtils from '../../src/libs/DateUtils';
 import * as Localize from '../../src/libs/Localize';
@@ -35,16 +35,16 @@ describe('Sidebar', () => {
     );
 
     beforeEach(() => {
-        // Wrap Onyx each onyx action with waitForPromiseToResolve
-        wrapOnyxWithWaitForPromisesToResolve(Onyx);
+        // Wrap Onyx each onyx action with waitForBatchedUpdates
+        wrapOnyxWithWaitForBatchedUpdates(Onyx);
         // Initialize the network key for OfflineWithFeedback
-        Onyx.merge(ONYXKEYS.NETWORK, {isOffline: false});
+        return Onyx.merge(ONYXKEYS.NETWORK, {isOffline: false});
     });
 
     // Cleanup (ie. unmount) all rendered components and clear out Onyx after each test so that each test starts with a clean slate
     afterEach(() => {
         cleanup();
-        Onyx.clear();
+        return Onyx.clear();
     });
 
     describe('in default (most recent) mode', () => {
@@ -55,7 +55,7 @@ describe('Sidebar', () => {
             const report = LHNTestUtils.getFakeReport([]);
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated to contain that report
                     .then(() =>
                         Onyx.multiSet({
@@ -79,7 +79,7 @@ describe('Sidebar', () => {
             const report = LHNTestUtils.getFakeReport(['emptychat+1@test.com', 'emptychat+2@test.com'], 0);
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated to contain that report
                     .then(() =>
                         Onyx.multiSet({
@@ -107,7 +107,7 @@ describe('Sidebar', () => {
             };
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated to contain that report
                     .then(() =>
                         Onyx.multiSet({
@@ -137,7 +137,7 @@ describe('Sidebar', () => {
             };
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated to contain that data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -190,7 +190,7 @@ describe('Sidebar', () => {
             };
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated to contain that data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -242,7 +242,7 @@ describe('Sidebar', () => {
             };
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated to contain that data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -330,7 +330,7 @@ describe('Sidebar', () => {
                     LHNTestUtils.getDefaultRenderedSidebarLinks(report1.reportID);
 
                     return (
-                        waitForPromisesToResolve()
+                        waitForBatchedUpdates()
                             // When Onyx is updated to contain that data and the sidebar re-renders
                             .then(() =>
                                 Onyx.multiSet({
@@ -375,7 +375,7 @@ describe('Sidebar', () => {
             LHNTestUtils.getDefaultRenderedSidebarLinks(report1.reportID);
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated to contain that data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -421,7 +421,7 @@ describe('Sidebar', () => {
                     // When report 2 becomes the active report
                     .then(() => {
                         LHNTestUtils.getDefaultRenderedSidebarLinks(report2.reportID);
-                        return waitForPromisesToResolve();
+                        return waitForBatchedUpdates();
                     })
 
                     // Then report 1 should now disappear
@@ -446,7 +446,7 @@ describe('Sidebar', () => {
             LHNTestUtils.getDefaultRenderedSidebarLinks(draftReport.reportID);
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated to contain that data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -493,7 +493,7 @@ describe('Sidebar', () => {
             const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated to contain that data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -556,7 +556,7 @@ describe('Sidebar', () => {
             const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated to contain that data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -655,7 +655,7 @@ describe('Sidebar', () => {
                 LHNTestUtils.getDefaultRenderedSidebarLinks(report1.reportID);
 
                 return (
-                    waitForPromisesToResolve()
+                    waitForBatchedUpdates()
                         // When Onyx is updated to contain that data and the sidebar re-renders
                         .then(() =>
                             Onyx.multiSet({
@@ -707,7 +707,7 @@ describe('Sidebar', () => {
                 const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
 
                 return (
-                    waitForPromisesToResolve()
+                    waitForBatchedUpdates()
                         // When Onyx is updated to contain that data and the sidebar re-renders
                         .then(() =>
                             Onyx.multiSet({
@@ -758,7 +758,7 @@ describe('Sidebar', () => {
                 const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
 
                 return (
-                    waitForPromisesToResolve()
+                    waitForBatchedUpdates()
                         // When Onyx is updated to contain that data and the sidebar re-renders
                         .then(() =>
                             Onyx.multiSet({
@@ -807,7 +807,7 @@ describe('Sidebar', () => {
                 const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
 
                 return (
-                    waitForPromisesToResolve()
+                    waitForBatchedUpdates()
                         // When Onyx is updated to contain that data and the sidebar re-renders
                         .then(() =>
                             Onyx.multiSet({
@@ -852,7 +852,7 @@ describe('Sidebar', () => {
                 const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
 
                 return (
-                    waitForPromisesToResolve()
+                    waitForBatchedUpdates()
                         // When Onyx is updated to contain that data and the sidebar re-renders
                         .then(() =>
                             Onyx.multiSet({
@@ -874,7 +874,7 @@ describe('Sidebar', () => {
                         // When sidebar is rendered with the active report ID matching the archived report in Onyx
                         .then(() => {
                             LHNTestUtils.getDefaultRenderedSidebarLinks(report.reportID);
-                            return waitForPromisesToResolve();
+                            return waitForBatchedUpdates();
                         })
 
                         // Then the report is rendered in the LHN
diff --git a/tests/unit/SidebarOrderTest.js b/tests/unit/SidebarOrderTest.js
index c3942f24e626..4a693d679b86 100644
--- a/tests/unit/SidebarOrderTest.js
+++ b/tests/unit/SidebarOrderTest.js
@@ -1,8 +1,8 @@
 import Onyx from 'react-native-onyx';
 import {cleanup, screen} from '@testing-library/react-native';
 import lodashGet from 'lodash/get';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
-import wrapOnyxWithWaitForPromisesToResolve from '../utils/wrapOnyxWithWaitForPromisesToResolve';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+import wrapOnyxWithWaitForBatchedUpdates from '../utils/wrapOnyxWithWaitForBatchedUpdates';
 import * as LHNTestUtils from '../utils/LHNTestUtils';
 import CONST from '../../src/CONST';
 import DateUtils from '../../src/libs/DateUtils';
@@ -36,8 +36,8 @@ describe('Sidebar', () => {
     );
 
     beforeEach(() => {
-        // Wrap Onyx each onyx action with waitForPromiseToResolve
-        wrapOnyxWithWaitForPromisesToResolve(Onyx);
+        // Wrap Onyx each onyx action with waitForBatchedUpdates
+        wrapOnyxWithWaitForBatchedUpdates(Onyx);
         // Initialize the network key for OfflineWithFeedback
         return Onyx.merge(ONYXKEYS.NETWORK, {isOffline: false});
     });
@@ -64,7 +64,7 @@ describe('Sidebar', () => {
             LHNTestUtils.getDefaultRenderedSidebarLinks();
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated with some personal details
                     .then(() =>
                         Onyx.multiSet({
@@ -88,7 +88,7 @@ describe('Sidebar', () => {
             LHNTestUtils.getDefaultRenderedSidebarLinks(report.reportID);
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -120,7 +120,7 @@ describe('Sidebar', () => {
             Report.addComment(report3.reportID, 'Hi, this is a comment');
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -166,7 +166,7 @@ describe('Sidebar', () => {
             LHNTestUtils.getDefaultRenderedSidebarLinks(currentReportId);
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -209,7 +209,7 @@ describe('Sidebar', () => {
             Report.addComment(report3.reportID, 'Hi, this is a comment');
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -262,7 +262,7 @@ describe('Sidebar', () => {
             LHNTestUtils.getDefaultRenderedSidebarLinks(currentReportId);
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -280,7 +280,7 @@ describe('Sidebar', () => {
                         // The changing of a route itself will re-render the component in the App, but since we are not performing this test
                         // inside the navigator and it has no access to the routes we need to trigger an update to the SidebarLinks manually.
                         LHNTestUtils.getDefaultRenderedSidebarLinks('1');
-                        return waitForPromisesToResolve();
+                        return waitForBatchedUpdates();
                     })
 
                     // Then the order of the reports should be 2 > 3 > 1
@@ -307,7 +307,7 @@ describe('Sidebar', () => {
             };
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -344,7 +344,7 @@ describe('Sidebar', () => {
             };
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -406,7 +406,7 @@ describe('Sidebar', () => {
             LHNTestUtils.getDefaultRenderedSidebarLinks(currentReportId);
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -458,7 +458,7 @@ describe('Sidebar', () => {
             };
             LHNTestUtils.getDefaultRenderedSidebarLinks('0');
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -518,7 +518,7 @@ describe('Sidebar', () => {
             };
             LHNTestUtils.getDefaultRenderedSidebarLinks('0');
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -577,7 +577,7 @@ describe('Sidebar', () => {
             const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
             LHNTestUtils.getDefaultRenderedSidebarLinks('0');
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -614,7 +614,7 @@ describe('Sidebar', () => {
             const report4 = LHNTestUtils.getFakeReport([7, 8], 0, true);
 
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // Given the sidebar is rendered in #focus mode (hides read chats)
                     // with all reports having unread comments
                     .then(() =>
@@ -669,7 +669,7 @@ describe('Sidebar', () => {
             const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
             LHNTestUtils.getDefaultRenderedSidebarLinks('0');
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -788,7 +788,7 @@ describe('Sidebar', () => {
             const currentlyLoggedInUserAccountID = 13;
             LHNTestUtils.getDefaultRenderedSidebarLinks('0');
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -846,7 +846,7 @@ describe('Sidebar', () => {
 
             LHNTestUtils.getDefaultRenderedSidebarLinks('0');
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
diff --git a/tests/unit/SidebarTest.js b/tests/unit/SidebarTest.js
index 84403ce5fc11..1b5daa323da5 100644
--- a/tests/unit/SidebarTest.js
+++ b/tests/unit/SidebarTest.js
@@ -1,8 +1,8 @@
 import Onyx from 'react-native-onyx';
 import {cleanup, screen} from '@testing-library/react-native';
 import lodashGet from 'lodash/get';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
-import wrapOnyxWithWaitForPromisesToResolve from '../utils/wrapOnyxWithWaitForPromisesToResolve';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+import wrapOnyxWithWaitForBatchedUpdates from '../utils/wrapOnyxWithWaitForBatchedUpdates';
 import * as LHNTestUtils from '../utils/LHNTestUtils';
 import CONST from '../../src/CONST';
 import * as Localize from '../../src/libs/Localize';
@@ -34,8 +34,8 @@ describe('Sidebar', () => {
     );
 
     beforeEach(() => {
-        // Wrap Onyx each onyx action with waitForPromiseToResolve
-        wrapOnyxWithWaitForPromisesToResolve(Onyx);
+        // Wrap Onyx each onyx action with waitForBatchedUpdates
+        wrapOnyxWithWaitForBatchedUpdates(Onyx);
         // Initialize the network key for OfflineWithFeedback
         return Onyx.merge(ONYXKEYS.NETWORK, {isOffline: false});
     });
@@ -59,7 +59,7 @@ describe('Sidebar', () => {
             const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
             LHNTestUtils.getDefaultRenderedSidebarLinks('0');
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -102,7 +102,7 @@ describe('Sidebar', () => {
             const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
             LHNTestUtils.getDefaultRenderedSidebarLinks('0');
             return (
-                waitForPromisesToResolve()
+                waitForBatchedUpdates()
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
diff --git a/tests/unit/TranslateTest.js b/tests/unit/TranslateTest.js
index 9ac23d6b81b0..45d4a12b61f5 100644
--- a/tests/unit/TranslateTest.js
+++ b/tests/unit/TranslateTest.js
@@ -7,19 +7,19 @@ const CONST = require('../../src/CONST').default;
 
 const originalTranslations = _.clone(translations);
 translations.default = {
-    [CONST.LOCALES.EN]: {
+    [CONST.LOCALES.EN]: translations.flattenObject({
         testKey1: 'English',
         testKey2: 'Test Word 2',
         testKey3: 'Test Word 3',
         testKeyGroup: {
             testFunction: ({testVariable}) => `With variable ${testVariable}`,
         },
-    },
-    [CONST.LOCALES.ES]: {
+    }),
+    [CONST.LOCALES.ES]: translations.flattenObject({
         testKey1: 'Spanish',
         testKey2: 'Spanish Word 2',
-    },
-    [CONST.LOCALES.ES_ES]: {testKey1: 'Spanish ES'},
+    }),
+    [CONST.LOCALES.ES_ES]: translations.flattenObject({testKey1: 'Spanish ES'}),
 };
 
 describe('translate', () => {
@@ -38,14 +38,12 @@ describe('translate', () => {
 
     test('Test when key is not found in default', () => {
         expect(() => Localize.translate(CONST.LOCALES.ES_ES, 'testKey4')).toThrow(Error);
-        expect(() => Localize.translate(CONST.LOCALES.ES_ES, ['a', 'b', 'c'])).toThrow(Error);
     });
 
     test('Test when key is not found in default (Production Mode)', () => {
         const ORIGINAL_IS_IN_PRODUCTION = CONFIG.default.IS_IN_PRODUCTION;
         CONFIG.default.IS_IN_PRODUCTION = true;
         expect(Localize.translate(CONST.LOCALES.ES_ES, 'testKey4')).toBe('testKey4');
-        expect(Localize.translate(CONST.LOCALES.ES_ES, ['a', 'b', 'c'])).toBe('a.b.c');
         CONFIG.default.IS_IN_PRODUCTION = ORIGINAL_IS_IN_PRODUCTION;
     });
 
@@ -53,7 +51,6 @@ describe('translate', () => {
         const expectedValue = 'With variable Test Variable';
         const testVariable = 'Test Variable';
         expect(Localize.translate(CONST.LOCALES.EN, 'testKeyGroup.testFunction', {testVariable})).toBe(expectedValue);
-        expect(Localize.translate(CONST.LOCALES.EN, ['testKeyGroup', 'testFunction'], {testVariable})).toBe(expectedValue);
     });
 });
 
@@ -97,3 +94,45 @@ describe('Translation Keys', () => {
         });
     });
 });
+
+describe('flattenObject', () => {
+    it('It should work correctly', () => {
+        const func = ({content}) => `This is the content: ${content}`;
+        const simpleObject = {
+            common: {
+                yes: 'Yes',
+                no: 'No',
+            },
+            complex: {
+                activity: {
+                    none: 'No Activity',
+                    some: 'Some Activity',
+                },
+                report: {
+                    title: {
+                        expense: 'Expense',
+                        task: 'Task',
+                    },
+                    description: {
+                        none: 'No description',
+                    },
+                    content: func,
+                    messages: ['Hello', 'Hi', 'Sup!'],
+                },
+            },
+        };
+
+        const result = translations.flattenObject(simpleObject);
+        expect(result).toStrictEqual({
+            'common.yes': 'Yes',
+            'common.no': 'No',
+            'complex.activity.none': 'No Activity',
+            'complex.activity.some': 'Some Activity',
+            'complex.report.title.expense': 'Expense',
+            'complex.report.title.task': 'Task',
+            'complex.report.description.none': 'No description',
+            'complex.report.content': func,
+            'complex.report.messages': ['Hello', 'Hi', 'Sup!'],
+        });
+    });
+});
diff --git a/tests/unit/enhanceParametersTest.js b/tests/unit/enhanceParametersTest.js
index 8dc625ba6d23..fb2ccc86ad79 100644
--- a/tests/unit/enhanceParametersTest.js
+++ b/tests/unit/enhanceParametersTest.js
@@ -1,7 +1,7 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../../src/ONYXKEYS';
 import enhanceParameters from '../../src/libs/Network/enhanceParameters';
-import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import CONFIG from '../../src/CONFIG';
 
 beforeEach(() => Onyx.clear());
@@ -12,7 +12,7 @@ test('Enhance parameters adds correct parameters for Log command with no authTok
     const email = 'test-user@test.com';
     const authToken = 'test-token';
     Onyx.merge(ONYXKEYS.SESSION, {email, authToken});
-    return waitForPromisesToResolve().then(() => {
+    return waitForBatchedUpdates().then(() => {
         const finalParameters = enhanceParameters(command, parameters);
         expect(finalParameters).toEqual({
             testParameter: 'test',
@@ -30,7 +30,7 @@ test('Enhance parameters adds correct parameters for a command that requires aut
     const email = 'test-user@test.com';
     const authToken = 'test-token';
     Onyx.merge(ONYXKEYS.SESSION, {email, authToken});
-    return waitForPromisesToResolve().then(() => {
+    return waitForBatchedUpdates().then(() => {
         const finalParameters = enhanceParameters(command, parameters);
         expect(finalParameters).toEqual({
             testParameter: 'test',
diff --git a/tests/utils/LHNTestUtils.js b/tests/utils/LHNTestUtils.js
index 43090cf024e2..7cb69b23a578 100644
--- a/tests/utils/LHNTestUtils.js
+++ b/tests/utils/LHNTestUtils.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import {render} from '@testing-library/react-native';
 import ComposeProviders from '../../src/components/ComposeProviders';
 import OnyxProvider from '../../src/components/OnyxProvider';
-import {LocaleContextProvider} from '../../src/components/withLocalize';
+import {LocaleContextProvider} from '../../src/components/LocaleContextProvider';
 import SidebarLinksData from '../../src/pages/home/sidebar/SidebarLinksData';
 import {EnvironmentProvider} from '../../src/components/withEnvironment';
 import CONST from '../../src/CONST';
diff --git a/tests/utils/TestHelper.js b/tests/utils/TestHelper.js
index a8424d14ed33..ca3955e9eb90 100644
--- a/tests/utils/TestHelper.js
+++ b/tests/utils/TestHelper.js
@@ -5,7 +5,7 @@ import CONST from '../../src/CONST';
 import * as Session from '../../src/libs/actions/Session';
 import HttpUtils from '../../src/libs/HttpUtils';
 import ONYXKEYS from '../../src/ONYXKEYS';
-import waitForPromisesToResolve from './waitForPromisesToResolve';
+import waitForBatchedUpdates from './waitForBatchedUpdates';
 import * as NumberUtils from '../../src/libs/NumberUtils';
 
 /**
@@ -25,7 +25,6 @@ function buildPersonalDetails(login, accountID, firstName = 'Test') {
         lastName: 'User',
         pronouns: '',
         timezone: CONST.DEFAULT_TIME_ZONE,
-        payPalMeAddress: '',
         phoneNumber: '',
     };
 }
@@ -73,7 +72,7 @@ function signInWithTestUser(accountID = 1, login = 'test@user.com', password = '
 
     // Simulate user entering their login and populating the credentials.login
     Session.beginSignIn(login);
-    return waitForPromisesToResolve()
+    return waitForBatchedUpdates()
         .then(() => {
             // Response is the same for calls to Authenticate and BeginSignIn
             HttpUtils.xhr.mockResolvedValue({
@@ -117,7 +116,7 @@ function signInWithTestUser(accountID = 1, login = 'test@user.com', password = '
                 jsonCode: 200,
             });
             Session.signIn(password);
-            return waitForPromisesToResolve();
+            return waitForBatchedUpdates();
         })
         .then(() => {
             HttpUtils.xhr = originalXhr;
@@ -129,7 +128,7 @@ function signOutTestUser() {
     HttpUtils.xhr = jest.fn();
     HttpUtils.xhr.mockResolvedValue({jsonCode: 200});
     Session.signOutAndRedirectToSignIn();
-    return waitForPromisesToResolve().then(() => (HttpUtils.xhr = originalXhr));
+    return waitForBatchedUpdates().then(() => (HttpUtils.xhr = originalXhr));
 }
 
 /**
@@ -175,7 +174,7 @@ function getGlobalFetchMock() {
     mockFetch.resume = () => {
         isPaused = false;
         _.each(queue, (resolve) => resolve(getResponse()));
-        return waitForPromisesToResolve();
+        return waitForBatchedUpdates();
     };
     mockFetch.fail = () => (shouldFail = true);
     mockFetch.succeed = () => (shouldFail = false);
@@ -192,7 +191,7 @@ function setPersonalDetails(login, accountID) {
     Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {
         [accountID]: buildPersonalDetails(login, accountID),
     });
-    return waitForPromisesToResolve();
+    return waitForBatchedUpdates();
 }
 
 /**
diff --git a/tests/utils/getIsUsingFakeTimers.js b/tests/utils/getIsUsingFakeTimers.js
new file mode 100644
index 000000000000..376312ac6c06
--- /dev/null
+++ b/tests/utils/getIsUsingFakeTimers.js
@@ -0,0 +1 @@
+export default () => Boolean(global.setTimeout.mock || global.setTimeout.clock);
diff --git a/tests/utils/waitForBatchedUpdates.js b/tests/utils/waitForBatchedUpdates.js
new file mode 100644
index 000000000000..2c4dbec250bc
--- /dev/null
+++ b/tests/utils/waitForBatchedUpdates.js
@@ -0,0 +1,39 @@
+import getIsUsingFakeTimers from './getIsUsingFakeTimers';
+/**
+ * Method which waits for all asynchronous JS to stop executing before proceeding. This helps test things like actions
+ * that expect some Onyx value to be available. This way we do not have to explicitly wait for an action to finish
+ * (e.g. by making it a promise and waiting for it to resolve).
+ *
+ * **Note:** It is recommended to wait for the Onyx operations, so in your tests its preferred to do:
+ *  ✅  Onyx.merge(...).then(...)
+ *  than to do
+ *  ❌  Onyx.merge(...)
+ *      waitForBatchedUpdates().then(...)
+ *
+ * @returns {Promise}
+ */
+export default () =>
+    new Promise((outerResolve) => {
+        // We first need to exhaust the microtask queue, before we schedule the next task in the macrotask queue (setTimeout).
+        // This is because we need to wait for all async onyx operations to finish, as they might schedule other macrotasks,
+        // and we want those task to run before our scheduled task.
+        // E.g. this makes the following code work for tests:
+        //
+        //   Onyx.merge(...)
+        //   return waitForBatchedUpdates().then(...);
+        //
+        // Note: Ideally, you'd just await the Onyx.merge promise.
+
+        new Promise((innerResolve) => {
+            setImmediate(() => {
+                innerResolve("Flush all micro tasks that pushed by using '.then' method");
+            });
+        }).then(() => {
+            if (getIsUsingFakeTimers()) {
+                jest.runOnlyPendingTimers();
+                outerResolve();
+                return;
+            }
+            setTimeout(outerResolve, 0);
+        });
+    });
diff --git a/tests/utils/waitForPromisesToResolveWithAct.js b/tests/utils/waitForBatchedUpdatesWithAct.js
similarity index 84%
rename from tests/utils/waitForPromisesToResolveWithAct.js
rename to tests/utils/waitForBatchedUpdatesWithAct.js
index eaef0f3b1a9d..125cf74159b3 100644
--- a/tests/utils/waitForPromisesToResolveWithAct.js
+++ b/tests/utils/waitForBatchedUpdatesWithAct.js
@@ -1,5 +1,5 @@
 import {act} from '@testing-library/react-native';
-import waitForPromisesToResolve from './waitForPromisesToResolve';
+import waitForBatchedUpdates from './waitForBatchedUpdates';
 
 /**
  * This method is necessary because react-navigation's NavigationContainer makes an internal state update when parsing the
@@ -18,16 +18,16 @@ import waitForPromisesToResolve from './waitForPromisesToResolve';
  *
  * When not to use this:
  *
- *     - You're not rendering any react components at all in your tests, but have some async logic you need to wait for e.g. Onyx.merge(). Use waitForPromisesToResolve().
- *     - You're writing UI tests but don't see any errors or warnings related to using act(). You probably don't need this in that case and should use waitForPromisesToResolve().
+ *     - You're not rendering any react components at all in your tests, but have some async logic you need to wait for e.g. Onyx.merge(). Use waitForBatchedUpdates().
+ *     - You're writing UI tests but don't see any errors or warnings related to using act(). You probably don't need this in that case and should use waitForBatchedUpdates().
  *     - You're writing UI test and do see a warning about using act(), but there's no asynchronous code that needs to run inside act().
  *
  * @returns {Promise}
  */
 // eslint-disable-next-line @lwc/lwc/no-async-await
-export default async function waitForPromisesToResolveWithAct() {
+export default async function waitForBatchedUpdatesWithAct() {
     // eslint-disable-next-line @lwc/lwc/no-async-await
     await act(async () => {
-        await waitForPromisesToResolve();
+        await waitForBatchedUpdates();
     });
 }
diff --git a/tests/utils/waitForNetworkPromises.js b/tests/utils/waitForNetworkPromises.js
new file mode 100644
index 000000000000..a60061d597e3
--- /dev/null
+++ b/tests/utils/waitForNetworkPromises.js
@@ -0,0 +1,14 @@
+import waitForBatchedUpdates from './waitForBatchedUpdates';
+
+/**
+ * Method flushes microtasks and pending timers twice. Because we batch onyx updates
+ * Network requests takes 2 microtask cycles to resolve
+ * **Note:** It is recommended to wait for the Onyx operations, so in your tests its preferred to do:
+ *  ✅  Onyx.merge(...).then(...)
+ *  than to do
+ *  ❌  Onyx.merge(...)
+ *      waitForBatchedUpdates().then(...)
+ *
+ * @returns {Promise}
+ */
+export default () => waitForBatchedUpdates().then(waitForBatchedUpdates);
diff --git a/tests/utils/waitForPromisesToResolve.js b/tests/utils/waitForPromisesToResolve.js
deleted file mode 100644
index 97146e6a8d86..000000000000
--- a/tests/utils/waitForPromisesToResolve.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Method which waits for all asynchronous JS to stop executing before proceeding. This helps test things like actions
- * that expect some Onyx value to be available. This way we do not have to explicitly wait for an action to finish
- * (e.g. by making it a promise and waiting for it to resolve).
- *
- * @returns {Promise}
- */
-export default () => new Promise(setImmediate);
diff --git a/tests/utils/wrapOnyxWithWaitForPromisesToResolve.js b/tests/utils/wrapOnyxWithWaitForBatchedUpdates.js
similarity index 73%
rename from tests/utils/wrapOnyxWithWaitForPromisesToResolve.js
rename to tests/utils/wrapOnyxWithWaitForBatchedUpdates.js
index c560c50538bd..e5b6e6bfdfcf 100644
--- a/tests/utils/wrapOnyxWithWaitForPromisesToResolve.js
+++ b/tests/utils/wrapOnyxWithWaitForBatchedUpdates.js
@@ -1,4 +1,4 @@
-import waitForPromisesToResolve from './waitForPromisesToResolve';
+import waitForBatchedUpdates from './waitForBatchedUpdates';
 
 /**
  * When we change data in onyx, the listeners (components) will be notified
@@ -10,11 +10,11 @@ import waitForPromisesToResolve from './waitForPromisesToResolve';
  *
  * @param {Object} onyxInstance
  */
-export default function wrapOnyxWithWaitForPromisesToResolve(onyxInstance) {
+export default function wrapOnyxWithWaitForBatchedUpdates(onyxInstance) {
     const multiSetImpl = onyxInstance.multiSet;
     // eslint-disable-next-line no-param-reassign
-    onyxInstance.multiSet = (...args) => multiSetImpl(...args).then((result) => waitForPromisesToResolve().then(() => result));
+    onyxInstance.multiSet = (...args) => multiSetImpl(...args).then((result) => waitForBatchedUpdates().then(() => result));
     const mergeImpl = onyxInstance.merge;
     // eslint-disable-next-line no-param-reassign
-    onyxInstance.merge = (...args) => mergeImpl(...args).then((result) => waitForPromisesToResolve().then(() => result));
+    onyxInstance.merge = (...args) => mergeImpl(...args).then((result) => waitForBatchedUpdates().then(() => result));
 }
diff --git a/tsconfig.json b/tsconfig.json
index d138ce81e36c..0c88512b9749 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -32,6 +32,6 @@
         "skipLibCheck": true,
         "incremental": true
     },
-    "exclude": ["**/node_modules/*", "**/dist/*", ".github/actions/**/index.js"],
+    "exclude": ["**/node_modules/*", "**/dist/*", ".github/actions/**/index.js", "**/docs/*"],
     "include": ["src", "desktop", "web", "docs", "assets", "config", "tests", "jest", "__mocks__", ".github/**/*", ".storybook/**/*"]
 }
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);
+        });
+    });
+});